8:52 p.m.
Author: thomas.heute(a)jboss.com
Date: 2008-11-03 14:52:28 -0500 (Mon, 03 Nov 2008)
New Revision: 12238
Added:
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/Constants.java
Modified:
modules/presentation/trunk/.classpath
modules/presentation/trunk/ajax/pom.xml
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxLayout.java
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxWindow.java
modules/presentation/trunk/build/pom.xml
modules/presentation/trunk/portal/pom.xml
modules/presentation/trunk/portal/src/assemble/presentation-portal-war.xml
Log:
Fixed some stuff
Modified: modules/presentation/trunk/.classpath
===================================================================
--- modules/presentation/trunk/.classpath 2008-11-03 15:57:37 UTC (rev 12237)
+++ modules/presentation/trunk/.classpath 2008-11-03 19:52:28 UTC (rev 12238)
@@ -6,6 +6,7 @@
<classpathentry kind="src" output="ajax/target/classes"
path="ajax/src/main/java"/>
<classpathentry kind="src" output="portal/target/classes"
path="portal/src/main/java"/>
<classpathentry kind="src" output="portal/target/test-classes"
path="portal/src/test/java"/>
+ <classpathentry kind="src" path="theme/src/main/java"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
Modified: modules/presentation/trunk/ajax/pom.xml
===================================================================
--- modules/presentation/trunk/ajax/pom.xml 2008-11-03 15:57:37 UTC (rev 12237)
+++ modules/presentation/trunk/ajax/pom.xml 2008-11-03 19:52:28 UTC (rev 12238)
@@ -28,20 +28,9 @@
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-servlet</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-dev</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.jboss.portal.common</groupId>
<artifactId>common-common</artifactId>
</dependency>
@@ -108,13 +97,23 @@
</activation>
<properties>
<gwt.os>mac</gwt.os>
-
<gwt.compiler.classpath>${maven.dependency.com.google.gwt.gwt-dev-mac.jar.path}</gwt.compiler.classpath>
+
<gwt.compiler.classpath>${maven.dependency.com.google.gwt.gwt-dev.jar.path}</gwt.compiler.classpath>
</properties>
<dependencies>
<dependency>
<groupId>com.google.gwt</groupId>
- <artifactId>gwt-dev-mac</artifactId>
+ <artifactId>gwt-dev</artifactId>
<version>${version.gwt}</version>
+ <classifier>mac-libs</classifier>
+ <type>zip</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-dev</artifactId>
+ <version>${version.gwt}</version>
+ <classifier>mac</classifier>
<scope>package</scope>
</dependency>
</dependencies>
@@ -128,13 +127,23 @@
</activation>
<properties>
<gwt.os>linux</gwt.os>
-
<gwt.compiler.classpath>${maven.dependency.com.google.gwt.gwt-dev.jar.path}</gwt.compiler.classpath>
+
<gwt.compiler.classpath>/home/theute/.m2/repository/com/google/gwt/gwt-dev/${version.gwt}/gwt-dev-${version.gwt}-linux.jar</gwt.compiler.classpath>
</properties>
<dependencies>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-dev</artifactId>
<version>${version.gwt}</version>
+ <classifier>linux-libs</classifier>
+ <type>zip</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-dev</artifactId>
+ <version>${version.gwt}</version>
+ <classifier>linux</classifier>
<scope>package</scope>
</dependency>
</dependencies>
@@ -160,6 +169,8 @@
<phase>package</phase>
<configuration>
<tasks>
+ <echo>maven.dependency.com.google.gwt.gwt-user.jar.path:
${maven.dependency.com.google.gwt.gwt-user.jar.path}</echo>
+ <echo>gwt.compiler.classpath:
${gwt.compiler.classpath}</echo>
<java
fork="true"
classname="com.google.gwt.dev.GWTCompiler">
Added:
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/Constants.java
===================================================================
---
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/Constants.java
(rev 0)
+++
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/Constants.java 2008-11-03
19:52:28 UTC (rev 12238)
@@ -0,0 +1,71 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.ajax.client;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien
Viet</a>
+ * @version $Revision: 630 $
+ */
+public class Constants
+{
+
+ /** . */
+ public static final String LAYOUT_ID =
"org.jboss.portal.presentation.layout_id";
+
+ /** . */
+ public static final String SIMPLE_LAYOUT = "simple";
+
+ /** . */
+ public static final String REGION_LAYOUT = "region";
+
+ /** . */
+ public static final String DESKTOP_LAYOUT = "desktop";
+
+ /** . */
+ public static final String SIMPLE_LAYOUT_ORIENTATION =
"org.jboss.portal.presentation.layout.simple.orientation";
+
+ /** . */
+ public static final String SIMPLE_LAYOUT_INDEX =
"org.jboss.portal.presentation.layout.simple.index";
+
+ /** . */
+ public static final String VERTICAL_ORIENTATION = "vertical";
+
+ /** . */
+ public static final String HORIZONTAL_ORIENTATION = "horizontal";
+
+ /** . */
+ public static final String REGION_LAYOUT_TEMPLATE =
"org.jboss.portal.presentation.layout.region.template";
+
+ /** . */
+ public static final String REGION_LAYOUT_NAME =
"org.jboss.portal.presentation.layout.region.name";
+
+ /** . */
+ public static final String REGION_LAYOUT_INDEX =
"org.jboss.portal.presentation.layout.region.index";
+
+ /** . */
+ public static final String DESKTOP_LAYOUT_X =
"org.jboss.portal.presentation.layout.desktop.x";
+
+ /** . */
+ public static final String DESKTOP_LAYOUT_Y =
"org.jboss.portal.presentation.layout.desktop.y";
+
+}
Modified:
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxLayout.java
===================================================================
---
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxLayout.java 2008-11-03
15:57:37 UTC (rev 12237)
+++
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxLayout.java 2008-11-03
19:52:28 UTC (rev 12238)
@@ -31,10 +31,10 @@
import java.util.Iterator;
import java.util.Map;
+import org.jboss.portal.presentation.ajax.client.Constants;
import org.jboss.portal.presentation.ajax.client.protocol.MoveObjectAction;
import org.jboss.portal.presentation.ajax.client.dnd.Draggable;
import org.jboss.portal.presentation.ajax.client.dnd.Droppable;
-import org.jboss.portal.presentation.layout.Constants;
/**
* @author <a href="mailto:julien@jboss-portal.org">Julien
Viet</a>
Modified:
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxWindow.java
===================================================================
---
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxWindow.java 2008-11-03
15:57:37 UTC (rev 12237)
+++
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxWindow.java 2008-11-03
19:52:28 UTC (rev 12238)
@@ -272,12 +272,12 @@
protected void doRemoveChild(AjaxObject child)
{
- throw new UnsupportedOperationException();
+// throw new UnsupportedOperationException();
}
protected void doAddChild(AjaxObject child)
{
- throw new UnsupportedOperationException();
+// throw new UnsupportedOperationException();
}
public Widget getWidget()
Modified: modules/presentation/trunk/build/pom.xml
===================================================================
--- modules/presentation/trunk/build/pom.xml 2008-11-03 15:57:37 UTC (rev 12237)
+++ modules/presentation/trunk/build/pom.xml 2008-11-03 19:52:28 UTC (rev 12238)
@@ -28,7 +28,7 @@
<version.apache-log4j>1.2.8</version.apache-log4j>
<version.junit>3.8.1</version.junit>
<version.httpunit>1.6</version.httpunit>
- <version.gwt>1.5.1</version.gwt>
+ <version.gwt>1.5.3</version.gwt>
<version.portlet-api>2.0</version.portlet-api>
@@ -120,12 +120,6 @@
</dependency>
<dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-dev</artifactId>
- <version>${version.gwt}</version>
- </dependency>
-
- <dependency>
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
<version>${version.portlet-api}</version>
Modified: modules/presentation/trunk/portal/pom.xml
===================================================================
--- modules/presentation/trunk/portal/pom.xml 2008-11-03 15:57:37 UTC (rev 12237)
+++ modules/presentation/trunk/portal/pom.xml 2008-11-03 19:52:28 UTC (rev 12238)
@@ -142,7 +142,7 @@
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>unpack-presesntation-ajax</id>
+ <id>unpack-presentation-ajax</id>
<goals>
<goal>unpack-dependencies</goal>
</goals>
Modified: modules/presentation/trunk/portal/src/assemble/presentation-portal-war.xml
===================================================================
--- modules/presentation/trunk/portal/src/assemble/presentation-portal-war.xml 2008-11-03
15:57:37 UTC (rev 12237)
+++ modules/presentation/trunk/portal/src/assemble/presentation-portal-war.xml 2008-11-03
19:52:28 UTC (rev 12238)
@@ -53,7 +53,7 @@
<include>org.jboss.portal.presentation:presentation-classic</include>
<include>org.jboss.portal.presentation:presentation-ajax</include
>
- <include>com.google.gwt:gwt-servlet</include>
+ <include>com.google.gwt:gwt-user</include>
<include>javax.ccpp:ccpp</include>
<include>javax.portlet:portlet-api</include>