[kune-commits] r1165 - in kune-ws-armor/trunk: . src src/cc src/cc/kune src/cc/kune/core src/cc/kune/core/ws src/cc/kune/core/ws/armor src/cc/kune/core/ws/armor/client src/cc/kune/core/ws/armor/client/resources src/org/ourproject/kune/ws/armor src/org/ourproject/kune/ws/armor/client war war/WEB-INF
Vicente J. Ruiz Jurado
vjrj_ at ourproject.org
Wed Dec 15 03:38:21 CET 2010
Author: vjrj_
Date: 2010-12-15 03:38:20 +0100 (Wed, 15 Dec 2010)
New Revision: 1165
Added:
kune-ws-armor/trunk/src/cc/
kune-ws-armor/trunk/src/cc/kune/
kune-ws-armor/trunk/src/cc/kune/core/
kune-ws-armor/trunk/src/cc/kune/core/ws/
kune-ws-armor/trunk/src/cc/kune/core/ws/armor/
kune-ws-armor/trunk/src/cc/kune/core/ws/armor/WsArmor.gwt.xml
kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/
kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.java
kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.ui.xml
kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/IBody.java
kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmor.java
kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/entitytools/
kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/resources/
kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/resources/WsArmorResources.java
kune-ws-armor/trunk/src/cc/kune/core/ws/armor/public/
kune-ws-armor/trunk/src/cc/kune/core/ws/armor/server/
Removed:
kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/resources/WsArmorResources.java
kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/WsArmor.gwt.xml
kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/entitytools/
kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/resources/
kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/public/
kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/server/
Modified:
kune-ws-armor/trunk/
kune-ws-armor/trunk/pom.xml
kune-ws-armor/trunk/war/
kune-ws-armor/trunk/war/WEB-INF/web.xml
kune-ws-armor/trunk/war/WsArmor.html
Log:
Incomplete - task : Startup cleanup and gwtp integration
CLOSED - # 8: Startup cleanup and gwtp integration
http://kune.ourproject.org/issues/ticket/8
Property changes on: kune-ws-armor/trunk
___________________________________________________________________
Name: svn:ignore
- .gwt
+ .gwt
target
Modified: kune-ws-armor/trunk/pom.xml
===================================================================
--- kune-ws-armor/trunk/pom.xml 2010-12-15 02:26:32 UTC (rev 1164)
+++ kune-ws-armor/trunk/pom.xml 2010-12-15 02:38:20 UTC (rev 1165)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>kune-ws-armor</groupId>
<artifactId>kune-ws-armor</artifactId>
- <version>0.0.4</version>
+ <version>0.0.5</version>
<name>Kune Armor Main Layout</name>
<description>The current armor of Kune Workspace</description>
<properties>
Copied: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/WsArmor.gwt.xml (from rev 1161, kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/WsArmor.gwt.xml)
===================================================================
--- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/WsArmor.gwt.xml (rev 0)
+++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/WsArmor.gwt.xml 2010-12-15 02:38:20 UTC (rev 1165)
@@ -0,0 +1,12 @@
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/src/gwt-module.dtd">
+<module>
+ <inherits name="com.google.gwt.user.User" />
+ <inherits name="com.google.gwt.user.theme.standard.Standard" />
+ <entry-point class="cc.kune.core.ws.armor.client.WsArmor" />
+ <public path="public" />
+ <source path="client" />
+ <!-- NOTE: this only compiles for chromium/safari ============= -->
+ <!--http://code.google.com/p/google-web-toolkit/issues/detail?id=42 -->
+ <!-- <set-property name="user.agent" value="gecko1_8" /> -->
+ <set-property name="user.agent" value="safari" />
+</module>
\ No newline at end of file
Copied: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.java (from rev 1155, kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/Body.java)
===================================================================
--- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.java (rev 0)
+++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.java 2010-12-15 02:38:20 UTC (rev 1165)
@@ -0,0 +1,99 @@
+package cc.kune.core.ws.armor.client;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.DockLayoutPanel;
+import com.google.gwt.user.client.ui.FlowPanel;
+import com.google.gwt.user.client.ui.HasWidgets;
+import com.google.gwt.user.client.ui.SplitLayoutPanel;
+import com.google.gwt.user.client.ui.VerticalPanel;
+import com.google.gwt.user.client.ui.Widget;
+
+public class Body extends Composite implements IBody {
+
+ interface BodyUiBinder extends UiBinder<Widget, Body> {
+ }
+
+ private static BodyUiBinder uiBinder = GWT.create(BodyUiBinder.class);
+
+ @UiField
+ DockLayoutPanel mainpanel;
+ @UiField
+ FlowPanel sitebar;
+ @UiField
+ SplitLayoutPanel split;
+ @UiField
+ DockLayoutPanel splitCenter;
+ @UiField
+ DockLayoutPanel splitEast;
+ @UiField
+ VerticalPanel entityToolsSouth;
+ @UiField
+ VerticalPanel entityToolsNorth;
+ @UiField
+ VerticalPanel entityToolsCenter;
+ @UiField
+ FlowPanel entityHeader;
+ @UiField
+ FlowPanel entityFooter;
+ @UiField
+ FlowPanel docHeader;
+ @UiField
+ FlowPanel docSubheader;
+ @UiField
+ FlowPanel docFooter;
+
+ public Body() {
+ initWidget(uiBinder.createAndBindUi(this));
+ split.setWidgetMinSize(splitEast, 150);
+ // split.setWidgetMinSize(splitCenter, 200);
+ }
+
+ @Override
+ public HasWidgets getDocFooter() {
+ return docFooter;
+ }
+
+ @Override
+ public HasWidgets getDocHeader() {
+ return docHeader;
+ }
+
+ @Override
+ public HasWidgets getDocSubheader() {
+ return docSubheader;
+ }
+
+ @Override
+ public HasWidgets getEntityFooter() {
+ return entityFooter;
+ }
+
+ @Override
+ public HasWidgets getEntityHeader() {
+ return entityHeader;
+ }
+
+ @Override
+ public HasWidgets getEntityToolsCenter() {
+ return entityToolsCenter;
+ }
+
+ @Override
+ public HasWidgets getEntityToolsNorth() {
+ return entityToolsNorth;
+ }
+
+ @Override
+ public HasWidgets getEntityToolsSouth() {
+ return entityToolsSouth;
+ }
+
+ @Override
+ public HasWidgets getSitebar() {
+ return sitebar;
+ }
+
+}
Copied: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.ui.xml (from rev 1161, kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/Body.ui.xml)
===================================================================
--- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.ui.xml (rev 0)
+++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.ui.xml 2010-12-15 02:38:20 UTC (rev 1165)
@@ -0,0 +1,86 @@
+<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
+ xmlns:g="urn:import:com.google.gwt.user.client.ui">
+ <ui:with field='res'
+ type='cc.kune.core.ws.armor.client.resources.WsArmorResources' />
+ <g:DockLayoutPanel ui:field="mainpanel" styleName='{res.style.mainPanel}'
+ unit="PX">
+ <g:north size="20">
+ <g:FlowPanel ui:field="sitebar" height="20px"
+ styleName='{res.style.siteBar}'>
+ </g:FlowPanel>
+ </g:north>
+ <g:center>
+ <g:SplitLayoutPanel width="100%" height="100%"
+ ui:field="split">
+ <g:center size="1.0">
+ <g:DockLayoutPanel unit="PX" ui:field="splitCenter">
+ <g:north size="168">
+ <g:VerticalPanel width="100%" height="168px">
+ <g:FlowPanel height="70px" width="100%"
+ styleName="{res.style.entityHeader}" ui:field="entityHeader">
+ <!--<g:RichTextArea width="100%" height="70px" /> -->
+ </g:FlowPanel>
+ <g:FlowPanel width="100%" height="38px"
+ styleName="{res.style.docHeader}" ui:field="docHeader">
+ </g:FlowPanel>
+ <g:FlowPanel width="100%" height="60px"
+ styleName="{res.style.docSubheader}" ui:field="docSubheader">
+ <g:Image resource='{res.defThemeDocArrowDown}'
+ styleName='{res.style.docHeaderArrow}' />
+ </g:FlowPanel>
+ </g:VerticalPanel>
+ </g:north>
+ <g:center>
+ <g:DockLayoutPanel unit="PX"
+ styleName="{res.style.docEditorMargin}">
+ <g:west size="10">
+ <g:HTMLPanel />
+ </g:west>
+ <g:east size="15">
+ <g:HTMLPanel />
+ </g:east>
+ <g:center>
+ <g:ScrollPanel styleName="{res.style.docEditor}">
+ <g:HTML wordWrap="true" width="100%" height="100%"></g:HTML>
+ </g:ScrollPanel>
+ </g:center>
+ <g:south size="33.0">
+ <g:VerticalPanel height="33px" width="100%"
+ styleName="{res.style.docFooter}">
+ <g:FlowPanel width="100%" height="33"
+ ui:field="docFooter">
+ </g:FlowPanel>
+ </g:VerticalPanel>
+ </g:south>
+ </g:DockLayoutPanel>
+ </g:center>
+ <g:south size="36">
+ <g:FlowPanel height="36px" width="100%"
+ styleName="{res.style.entityFooter}" ui:field="entityFooter">
+ </g:FlowPanel>
+ </g:south>
+ </g:DockLayoutPanel>
+ </g:center>
+ <g:east size="200.0">
+ <g:DockLayoutPanel unit="PX"
+ styleName="{res.style.entityTools}" ui:field="splitEast">
+ <g:north size="190">
+ <g:VerticalPanel width="100%" ui:field="entityToolsNorth"
+ styleName="{res.style.entityToolsNorth}"></g:VerticalPanel>
+ </g:north>
+ <g:center>
+ <g:VerticalPanel width="100%" ui:field="entityToolsCenter"
+ styleName="{res.style.entityToolsCenter}">
+ </g:VerticalPanel>
+ </g:center>
+ <g:south size="98">
+ <g:VerticalPanel width="100%"
+ styleName="{res.style.entityToolsSouth}" ui:field="entityToolsSouth"></g:VerticalPanel>
+ </g:south>
+ </g:DockLayoutPanel>
+ </g:east>
+ </g:SplitLayoutPanel>
+ </g:center>
+ </g:DockLayoutPanel>
+</ui:UiBinder>
\ No newline at end of file
Copied: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/IBody.java (from rev 1155, kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/IBody.java)
===================================================================
--- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/IBody.java (rev 0)
+++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/IBody.java 2010-12-15 02:38:20 UTC (rev 1165)
@@ -0,0 +1,24 @@
+package cc.kune.core.ws.armor.client;
+
+import com.google.gwt.user.client.ui.HasWidgets;
+
+public interface IBody {
+
+ HasWidgets getDocFooter();
+
+ HasWidgets getDocHeader();
+
+ HasWidgets getDocSubheader();
+
+ HasWidgets getEntityFooter();
+
+ HasWidgets getEntityHeader();
+
+ HasWidgets getEntityToolsCenter();
+
+ HasWidgets getEntityToolsNorth();
+
+ HasWidgets getEntityToolsSouth();
+
+ HasWidgets getSitebar();
+}
\ No newline at end of file
Property changes on: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/IBody.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmor.java (from rev 1156, kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/WsArmor.java)
===================================================================
--- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmor.java (rev 0)
+++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmor.java 2010-12-15 02:38:20 UTC (rev 1165)
@@ -0,0 +1,43 @@
+package cc.kune.core.ws.armor.client;
+
+
+import cc.kune.core.ws.armor.client.resources.WsArmorResources;
+
+import com.google.gwt.core.client.EntryPoint;
+import com.google.gwt.user.client.ui.InlineLabel;
+import com.google.gwt.user.client.ui.RootLayoutPanel;
+
+/**
+ * Entry point classes define <code>onModuleLoad()</code>.
+ */
+public class WsArmor implements EntryPoint {
+ public void onModuleLoad() {
+ final WsArmorResources resources = WsArmorResources.INSTANCE;
+ resources.style().ensureInjected();
+
+ final RootLayoutPanel rootPanel = RootLayoutPanel.get();
+ final Body armor = new Body();
+ final InlineLabel icons = new InlineLabel("Icons");
+ final InlineLabel login = new InlineLabel("Login");
+ final InlineLabel logo = new InlineLabel("Logo");
+ icons.setStyleName(resources.style().floatLeft());
+ login.setStyleName(resources.style().floatRight());
+ logo.setStyleName(resources.style().floatRight());
+ armor.getSitebar().add(icons);
+ armor.getSitebar().add(logo);
+ armor.getSitebar().add(login);
+ armor.getEntityToolsNorth().add(new InlineLabel("Group members"));
+ armor.getEntityToolsCenter().add(new InlineLabel("Documents"));
+ armor.getEntityToolsSouth().add(new InlineLabel("Group tags"));
+ armor.getEntityHeader().add(new InlineLabel("Name of the Initiative"));
+ armor.getDocHeader().add(new InlineLabel("Some doc title"));
+ final InlineLabel editors = new InlineLabel("Editors:");
+ editors.addStyleName(resources.style().docSubheaderLeft());
+ armor.getDocSubheader().add(editors);
+ armor.getDocFooter().add(new InlineLabel("Tags:"));
+ armor.getEntityFooter().add(new InlineLabel("Rate it:"));
+ rootPanel.add(armor);
+
+ }
+
+}
Copied: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/entitytools (from rev 1155, kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/entitytools)
Copied: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/resources (from rev 1156, kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/resources)
Deleted: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/resources/WsArmorResources.java
===================================================================
--- kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/resources/WsArmorResources.java 2010-12-06 20:15:56 UTC (rev 1156)
+++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/resources/WsArmorResources.java 2010-12-15 02:38:20 UTC (rev 1165)
@@ -1,56 +0,0 @@
-package org.ourproject.kune.ws.armor.client.resources;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
-import com.google.gwt.resources.client.CssResource;
-import com.google.gwt.resources.client.ImageResource;
-
-public interface WsArmorResources extends ClientBundle {
- public interface Style extends CssResource {
-
- String docEditor();
-
- String docEditorMargin();
-
- String docFooter();
-
- String docHeader();
-
- String docHeaderArrow();
-
- String docSubheader();
-
- String docSubheaderLeft();
-
- String entityFooter();
-
- String entityHeader();
-
- String entityTools();
-
- String entityToolsCenter();
-
- String entityToolsNorth();
-
- String entityToolsSouth();
-
- String floatLeft();
-
- String floatRight();
-
- String mainPanel();
-
- String siteBar();
- }
-
- public static final WsArmorResources INSTANCE = GWT.create(WsArmorResources.class);
-
- @Source("def-theme-doc-arrow-down.png")
- ImageResource defThemeDocArrowDown();
-
- @Source("def-theme-tools-arrow-left.png")
- ImageResource defThemeToolsArrowLeft();
-
- @Source("DefaultStyle.css")
- Style style();
-}
\ No newline at end of file
Copied: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/resources/WsArmorResources.java (from rev 1161, kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/resources/WsArmorResources.java)
===================================================================
--- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/resources/WsArmorResources.java (rev 0)
+++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/resources/WsArmorResources.java 2010-12-15 02:38:20 UTC (rev 1165)
@@ -0,0 +1,57 @@
+package cc.kune.core.ws.armor.client.resources;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.resources.client.ClientBundle;
+import com.google.gwt.resources.client.CssResource;
+import com.google.gwt.resources.client.ImageResource;
+
+public interface WsArmorResources extends ClientBundle {
+ public interface Style extends CssResource {
+
+ String docEditor();
+
+ String docEditorMargin();
+
+ String docFooter();
+
+ String docHeader();
+
+ String docHeaderArrow();
+
+ String docSubheader();
+
+ String docSubheaderLeft();
+
+ String entityFooter();
+
+ String entityHeader();
+
+ String entityTools();
+
+ String entityToolsCenter();
+
+ String entityToolsNorth();
+
+ String entityToolsSouth();
+
+ String floatLeft();
+
+ String floatRight();
+
+ String mainPanel();
+
+ String siteBar();
+ }
+
+ @Deprecated
+ public static final WsArmorResources INSTANCE = GWT.create(WsArmorResources.class);
+
+ @Source("def-theme-doc-arrow-down.png")
+ ImageResource defThemeDocArrowDown();
+
+ @Source("def-theme-tools-arrow-left.png")
+ ImageResource defThemeToolsArrowLeft();
+
+ @Source("DefaultStyle.css")
+ Style style();
+}
\ No newline at end of file
Copied: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/public (from rev 1152, kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/public)
Copied: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/server (from rev 1152, kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/server)
Deleted: kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/WsArmor.gwt.xml
===================================================================
--- kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/WsArmor.gwt.xml 2010-12-15 02:26:32 UTC (rev 1164)
+++ kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/WsArmor.gwt.xml 2010-12-15 02:38:20 UTC (rev 1165)
@@ -1,8 +0,0 @@
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/src/gwt-module.dtd">
-<module>
- <inherits name="com.google.gwt.user.User" />
- <inherits name="com.google.gwt.user.theme.standard.Standard" />
- <!-- <entry-point class="org.ourproject.kune.ws.armor.client.WsArmor" /> -->
- <public path="public" />
- <source path="client" />
-</module>
\ No newline at end of file
Property changes on: kune-ws-armor/trunk/war
___________________________________________________________________
Name: svn:ignore
- org.ourproject.kune.ws.armor.WsArmor
+ cc.kune.core.ws.armor.WsArmor
Modified: kune-ws-armor/trunk/war/WEB-INF/web.xml
===================================================================
--- kune-ws-armor/trunk/war/WEB-INF/web.xml 2010-12-15 02:26:32 UTC (rev 1164)
+++ kune-ws-armor/trunk/war/WEB-INF/web.xml 2010-12-15 02:38:20 UTC (rev 1165)
@@ -2,12 +2,9 @@
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
-
<web-app>
-
- <!-- Default page to serve -->
- <welcome-file-list>
- <welcome-file>WsArmor.html</welcome-file>
- </welcome-file-list>
-
-</web-app>
+ <!-- Default page to serve -->
+ <welcome-file-list>
+ <welcome-file>WsArmor.html</welcome-file>
+ </welcome-file-list>
+</web-app>
\ No newline at end of file
Modified: kune-ws-armor/trunk/war/WsArmor.html
===================================================================
--- kune-ws-armor/trunk/war/WsArmor.html 2010-12-15 02:26:32 UTC (rev 1164)
+++ kune-ws-armor/trunk/war/WsArmor.html 2010-12-15 02:38:20 UTC (rev 1165)
@@ -6,7 +6,7 @@
<!-- -->
<!-- Consider inlining CSS to reduce the number of requested files -->
<!-- -->
- <link rel="stylesheet" href="org.ourproject.kune.ws.armor.WsArmor/fontface/stylesheet.css" type="text/css" charset="utf-8">
+ <link rel="stylesheet" href="cc.kune.core.ws.armor.WsArmor/fontface/stylesheet.css" type="text/css" charset="utf-8">
<link type="text/css" rel="stylesheet" href="WsArmor.css">
@@ -20,7 +20,7 @@
<!-- If you add any GWT meta tags, they must -->
<!-- be added before this line. -->
<!-- -->
- <script language="javascript" src="org.ourproject.kune.ws.armor.WsArmor/org.ourproject.kune.ws.armor.WsArmor.nocache.js"></script>
+ <script language="javascript" src="cc.kune.core.ws.armor.WsArmor/cc.kune.core.ws.armor.WsArmor.nocache.js"></script>
</head>
More information about the kune-commits
mailing list