10:16 a.m.
Author: mwringe
Date: 2010-03-05 11:16:31 -0500 (Fri, 05 Mar 2010)
New Revision: 2011
Modified:
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java
portal/trunk/component/test/core/pom.xml
portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js
portal/trunk/packaging/pkg/pom.xml
portal/trunk/packaging/product/src/main/javascript/portal.packaging.product.js
portal/trunk/pom.xml
portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.bat
portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh
portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.bat
portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh
Log:
Update GTN so that it will build, complete the tests, and run on an IBM jdk
(GTNPORTAL-815)
-Remove default jdk Xshare option as its already the default on the Sun jdk, and its not
an option on the IBM jdk.
-Add the jcip.annotations jar to the test and to the build since the IBM jdk will fail
with a TypeNotFoundException without it (see GTNPORTAL-636).
-Specify the memory options for the compiler-plugin. If not set then GateIn with an out of
memory exception when building with the IBM jdk.
Modified:
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java
===================================================================
---
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java 2010-03-05
16:10:59 UTC (rev 2010)
+++
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java 2010-03-05
16:16:31 UTC (rev 2011)
@@ -116,6 +116,16 @@
PortalConfig pConfig = storage.getPortalConfig(PortalConfig.GROUP_TYPE,
"/groupTest");
assertNotNull("the Group's PortalConfig is not null", pConfig);
assertTrue(pConfig.getPortalLayout().getChildren() == null ||
pConfig.getPortalLayout().getChildren().size() == 4);
+
+ /**
+ * We need to remove the /groupTest from the groupHandler as the
+ * handler is shared between the tests and can cause other tests
+ * to fail.
+ * TODO: make the tests fully independent
+ */
+ groupHandler.removeGroup(group, false);
+ group = groupHandler.findGroupById("/groupTest");
+ assertNull(group);
}
public void testUserLayout() throws Exception
Modified: portal/trunk/component/test/core/pom.xml
===================================================================
--- portal/trunk/component/test/core/pom.xml 2010-03-05 16:10:59 UTC (rev 2010)
+++ portal/trunk/component/test/core/pom.xml 2010-03-05 16:16:31 UTC (rev 2011)
@@ -62,6 +62,11 @@
<artifactId>commons-dbcp</artifactId>
</dependency>
+ <dependency>
+ <groupId>net.jcip</groupId>
+ <artifactId>jcip-annotations</artifactId>
+ </dependency>
+
</dependencies>
<build>
Modified: portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js
===================================================================
---
portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js 2010-03-05
16:10:59 UTC (rev 2010)
+++
portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js 2010-03-05
16:16:31 UTC (rev 2011)
@@ -45,6 +45,7 @@
var shindigVersion = "${org.shindig.version}";
var groovyVersion = "${org.codehaus.groovy.version}";
var rhinoVersion = "${rhino.version}";
+ var jcipVersion = "${jcip.version}";
//TODO versions for gatein components
@@ -261,5 +262,10 @@
addDependency(new Project("org.exoplatform.portal",
"gatein-sample-portal", "ear", module.version)).
addDependency(new Project("org.exoplatform.portal",
"starter-gatein", "ear", module.version));
+ <!-- needed so that GTN can be run on the IBM jdk, to be removed when the IBM jdk
no longer needs this hack -->
+ module.ibm = {};
+ module.ibm.jdk = {};
+ module.ibm.jdk.support =new Project("net.jcip",
"jcip-annotations", "jar", jcipVersion);
+
return module;
}
Modified: portal/trunk/packaging/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/pkg/pom.xml 2010-03-05 16:10:59 UTC (rev 2010)
+++ portal/trunk/packaging/pkg/pom.xml 2010-03-05 16:16:31 UTC (rev 2011)
@@ -193,7 +193,6 @@
<argument>-Dexo.m2.repos=file:${settings.localRepository}</argument>
<argument>-Dclean.server=${exo.projects.app.tomcat.version}</argument>
<argument>-Dexo.m2.home=${maven.home}</argument>
- <argument>-Xshare:auto</argument>
<argument>-Xms128m</argument>
<argument>-Xmx512m</argument>
<argument>-classpath</argument>
@@ -294,7 +293,6 @@
<argument>-Dexo.m2.repos=file:${settings.localRepository},http://maven2...
<argument>-Dclean.server=${exo.projects.app.jboss.version}</argument>
<argument>-Dexo.m2.home=${maven.home}</argument>
- <argument>-Xshare:auto</argument>
<argument>-Xms128m</argument>
<argument>-Xmx512m</argument>
<argument>-classpath</argument>
@@ -394,7 +392,6 @@
<argument>-Dexo.m2.repos=file:${settings.localRepository}</argument>
<argument>-Dclean.server=${exo.projects.app.tomcat.version}</argument>
<argument>-Dexo.m2.home=${maven.home}</argument>
- <argument>-Xshare:auto</argument>
<argument>-Xms128m</argument>
<argument>-Xmx512m</argument>
<argument>-classpath</argument>
@@ -496,7 +493,6 @@
<argument>-Dexo.m2.repos=file:${settings.localRepository},http://maven2...
<argument>-Dclean.server=${exo.projects.app.jboss.version}</argument>
<argument>-Dexo.m2.home=${maven.home}</argument>
- <argument>-Xshare:auto</argument>
<argument>-Xms128m</argument>
<argument>-Xmx512m</argument>
<argument>-classpath</argument>
Modified: portal/trunk/packaging/product/src/main/javascript/portal.packaging.product.js
===================================================================
---
portal/trunk/packaging/product/src/main/javascript/portal.packaging.product.js 2010-03-05
16:10:59 UTC (rev 2010)
+++
portal/trunk/packaging/product/src/main/javascript/portal.packaging.product.js 2010-03-05
16:16:31 UTC (rev 2011)
@@ -47,6 +47,8 @@
product.addDependencies(portal.web.portal) ;
product.addDependencies(portal.sample.extension) ;
+ product.addDependencies(portal.ibm.jdk.support);
+
product.addServerPatch("tomcat", portal.server.tomcat.patch) ;
product.addServerPatch("jboss", portal.server.jboss.patch) ;
product.addServerPatch("jbossear", portal.server.jbossear.patch) ;
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-03-05 16:10:59 UTC (rev 2010)
+++ portal/trunk/pom.xml 2010-03-05 16:16:31 UTC (rev 2011)
@@ -55,6 +55,7 @@
<javax.servlet.version>2.5</javax.servlet.version>
<version.chromattic>1.0.0-cr2</version.chromattic>
<version.reflect>1.0.0-beta5</version.reflect>
+ <jcip.version>1.0</jcip.version>
<!-- ************** -->
<!-- Build settings -->
@@ -65,7 +66,6 @@
<!-- maven-release-plugin -->
<arguments>-Prelease,pkg-tomcat,pkg-jbossas
-Dmaven.test.skip=true</arguments>
-
</properties>
<scm>
@@ -673,6 +673,13 @@
<artifactId>junit</artifactId>
<version>3.8.1</version>
</dependency>
+
+ <!-- needed for the IBM jdk, should be remove in the future when IBM fixes
its jdk (see GTNPORTAL-636) -->
+ <dependency>
+ <groupId>net.jcip</groupId>
+ <artifactId>jcip-annotations</artifactId>
+ <version>${jcip.version}</version>
+ </dependency>
</dependencies>
@@ -752,6 +759,18 @@
</systemProperties>
</configuration>
</plugin>
+ <!-- we shouldn't need to specify this plugin here, but the maven
compiler plugin is not accepting its
+ memory option properties. This should be removed when we can just set
the compiler properties -->
+ <!-- we need to specify this as building GateIn can cause memory problems
with some JDKs (ie IBM) -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <fork>true</fork>
+ <meminitial>256m</meminitial>
+ <maxmem>1024m</maxmem>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.bat
===================================================================
--- portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.bat 2010-03-05
16:10:59 UTC (rev 2010)
+++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.bat 2010-03-05
16:16:31 UTC (rev 2011)
@@ -29,7 +29,7 @@
set SECURITY_OPTS="-Djava.security.auth.login.config=..\conf\jaas.conf"
set EXO_OPTS="-Dexo.product.developing=false -Dexo.conf.dir=..\gatein\conf"
set EXO_CONFIG_OPTS="-Dorg.exoplatform.container.configuration.debug"
-set JAVA_OPTS=-Xshare:auto -Xms128m -Xmx512m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS%
%EXO_CONFIG_OPTS%
+set JAVA_OPTS=-Xms128m -Xmx512m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS% %EXO_CONFIG_OPTS%
set JPDA_TRANSPORT=dt_socket
set JPDA_ADDRESS=8000
Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh
===================================================================
--- portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh 2010-03-05 16:10:59
UTC (rev 2010)
+++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh 2010-03-05 16:16:31
UTC (rev 2011)
@@ -25,7 +25,7 @@
LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"
SECURITY_OPTS="-Djava.security.auth.login.config=../conf/jaas.conf"
EXO_OPTS="-Dexo.product.developing=true -Dexo.conf.dir=../gatein/conf"
-EXO_CONFIG_OPTS="-Xshare:auto -Xms128m -Xmx512m
-Dorg.exoplatform.container.configuration.debug"
+EXO_CONFIG_OPTS="-Xms128m -Xmx512m
-Dorg.exoplatform.container.configuration.debug"
JPDA_TRANSPORT=dt_socket
JPDA_ADDRESS=8000
Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.bat
===================================================================
--- portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.bat 2010-03-05 16:10:59
UTC (rev 2010)
+++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.bat 2010-03-05 16:16:31
UTC (rev 2011)
@@ -28,7 +28,7 @@
set
LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"
set SECURITY_OPTS="-Djava.security.auth.login.config=..\conf\jaas.conf"
set EXO_OPTS="-Dexo.product.developing=false -Dexo.conf.dir=..\gatein\conf"
-set JAVA_OPTS=-Xshare:auto -Xms128m -Xmx512m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS%%
+set JAVA_OPTS=-Xms128m -Xmx512m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS%%
rem Launches the server
call catalina.bat %*
Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh
===================================================================
--- portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh 2010-03-05 16:10:59 UTC
(rev 2010)
+++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh 2010-03-05 16:16:31 UTC
(rev 2011)
@@ -29,7 +29,7 @@
SECURITY_OPTS="-Djava.security.auth.login.config=../conf/jaas.conf"
EXO_OPTS="-Dexo.product.developing=false -Dexo.conf.dir=../gatein/conf"
-JAVA_OPTS="-Xshare:auto -Xms128m -Xmx512m $JAVA_OPTS $LOG_OPTS $SECURITY_OPTS
$EXO_OPTS"
+JAVA_OPTS="-Xms128m -Xmx512m $JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS"
export JAVA_OPTS
# Launches the server