gatein SVN: r4725 - epp/portal/branches/EPP_5_1_Branch/gadgets/core/src/main/java/containers/default.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-10-19 09:12:17 -0400 (Tue, 19 Oct 2010)
New Revision: 4725
Modified:
epp/portal/branches/EPP_5_1_Branch/gadgets/core/src/main/java/containers/default/container.js
Log:
JBEPP-553: Remove gadget Error 404 in logs
Modified: epp/portal/branches/EPP_5_1_Branch/gadgets/core/src/main/java/containers/default/container.js
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/gadgets/core/src/main/java/containers/default/container.js 2010-10-19 13:03:41 UTC (rev 4724)
+++ epp/portal/branches/EPP_5_1_Branch/gadgets/core/src/main/java/containers/default/container.js 2010-10-19 13:12:17 UTC (rev 4725)
@@ -168,10 +168,10 @@
// E.g. "gadgets.rpc" : ["activities.requestCreate", "messages.requestSend", "requestShareApp", "requestPermission"]
"gadgets.rpc" : ["container.listMethods"]
},
- "osapi" : {
- // The endpoints to query for available JSONRPC/REST services
- "endPoints" : [ "http://%host%/social/rpc", "http://%host%/gadgets/api/rpc" ]
- },
+// "osapi" : {
+// // The endpoints to query for available JSONRPC/REST services
+// "endPoints" : [ "http://%host%/social/rpc", "http://%host%/gadgets/api/rpc" ]
+// },
"osml": {
// OSML library resource. Can be set to null or the empty string to disable OSML
// for a container.
13 years, 8 months
gatein SVN: r4724 - portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-10-19 09:03:41 -0400 (Tue, 19 Oct 2010)
New Revision: 4724
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml
Log:
GTNPORTAL-1574 : Use local configuration template for local JBoss cache config
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2010-10-19 12:58:29 UTC (rev 4723)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2010-10-19 13:03:41 UTC (rev 4724)
@@ -127,7 +127,7 @@
<init-params>
<value-param>
<name>cache.config.template</name>
- <value>classpath:/conf/jbosscache/cluster/config.xml</value>
+ <value>classpath:/conf/jbosscache/local/config.xml</value>
</value-param>
<value-param profiles="cluster">
<name>cache.config.template</name>
13 years, 8 months
gatein SVN: r4723 - portal/trunk/gadgets/core/src/main/java/containers/default.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-10-19 08:58:29 -0400 (Tue, 19 Oct 2010)
New Revision: 4723
Modified:
portal/trunk/gadgets/core/src/main/java/containers/default/container.js
Log:
GTNPORTAL-1539: Remove gadget Error 404 in logs
Modified: portal/trunk/gadgets/core/src/main/java/containers/default/container.js
===================================================================
--- portal/trunk/gadgets/core/src/main/java/containers/default/container.js 2010-10-19 12:32:08 UTC (rev 4722)
+++ portal/trunk/gadgets/core/src/main/java/containers/default/container.js 2010-10-19 12:58:29 UTC (rev 4723)
@@ -168,10 +168,10 @@
// E.g. "gadgets.rpc" : ["activities.requestCreate", "messages.requestSend", "requestShareApp", "requestPermission"]
"gadgets.rpc" : ["container.listMethods"]
},
- "osapi" : {
- // The endpoints to query for available JSONRPC/REST services
- "endPoints" : [ "http://%host%/social/rpc", "http://%host%/gadgets/api/rpc" ]
- },
+// "osapi" : {
+// // The endpoints to query for available JSONRPC/REST services
+// "endPoints" : [ "http://%host%/social/rpc", "http://%host%/gadgets/api/rpc" ]
+// },
"osml": {
// OSML library resource. Can be set to null or the empty string to disable OSML
// for a container.
13 years, 8 months
gatein SVN: r4722 - in components/shindig/trunk/java/gadgets/src: test/java/org/apache/shindig/gadgets/render and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-10-19 08:32:08 -0400 (Tue, 19 Oct 2010)
New Revision: 4722
Modified:
components/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java
components/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java
Log:
GTNPORTAL-1539: Remove gadget Error 404 in logs
Reverted previious fix tentative
Modified: components/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java
===================================================================
--- components/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java 2010-10-19 09:45:31 UTC (rev 4721)
+++ components/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java 2010-10-19 12:32:08 UTC (rev 4722)
@@ -51,7 +51,7 @@
static final Logger logger = Logger.getLogger(Renderer.class.getName());
- static final String JSON_RESPONSE_WRAPPER_ELEMENT = "result";
+ static final String JSON_RESPONSE_WRAPPER_ELEMENT = "data";
static final String OSAPI_FEATURE_CONFIG = "osapi";
Modified: components/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java
===================================================================
--- components/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java 2010-10-19 09:45:31 UTC (rev 4721)
+++ components/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java 2010-10-19 12:32:08 UTC (rev 4722)
@@ -113,11 +113,11 @@
public void testReadConfigWithValidEndpoints() throws Exception {
List<String> endPoint1Services = ImmutableList.of("do.something", "delete.someting");
JSONObject service1 = new JSONObject();
- service1.put("result", endPoint1Services);
+ service1.put("data", endPoint1Services);
List<String> endPoint2Services = ImmutableList.of("weather.get");
JSONObject service2 = new JSONObject();
- service2.put("result", endPoint2Services);
+ service2.put("data", endPoint2Services);
EasyMock.expect(mockFetcher.fetch(EasyMock.isA(HttpRequest.class))).andReturn(
new HttpResponse(service1.toString()));
13 years, 8 months
gatein SVN: r4721 - portal/trunk/component/common/src/main/java/org/exoplatform/commons/xml.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-10-19 05:45:31 -0400 (Tue, 19 Oct 2010)
New Revision: 4721
Modified:
portal/trunk/component/common/src/main/java/org/exoplatform/commons/xml/DOMSerializer.java
Log:
GTNPORTAL-1569 : use com.sun.xml.internal.stream.XMLOutputFactoryImpl constructor via reflection instead of XMLOutputFactory.newFactory() as this was added only since revision 18 of Java 6
Modified: portal/trunk/component/common/src/main/java/org/exoplatform/commons/xml/DOMSerializer.java
===================================================================
--- portal/trunk/component/common/src/main/java/org/exoplatform/commons/xml/DOMSerializer.java 2010-10-18 23:35:13 UTC (rev 4720)
+++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/xml/DOMSerializer.java 2010-10-19 09:45:31 UTC (rev 4721)
@@ -61,12 +61,13 @@
XMLOutputFactory tmp;
try
{
- tmp = XMLOutputFactory.newFactory(DEFAULT_XML_OUTPUT_FACTORY, Thread.currentThread().getContextClassLoader());
+ Class<XMLOutputFactory> cl = (Class<XMLOutputFactory>)Thread.currentThread().getContextClassLoader().loadClass(DEFAULT_XML_OUTPUT_FACTORY);
+ tmp = cl.newInstance();
}
- catch (FactoryConfigurationError error)
+ catch (Exception e)
{
- tmp = XMLOutputFactory.newFactory();
- log.warn("Could not use " + DEFAULT_XML_OUTPUT_FACTORY + " will use default provided by runtime instead " +
+ tmp = XMLOutputFactory.newInstance();
+ log.warn("Could not instantiate " + DEFAULT_XML_OUTPUT_FACTORY + " will use default provided by runtime instead " +
tmp.getClass().getName());
}
13 years, 8 months
gatein SVN: r4720 - in exo/portal/branches/3.1.x: packaging/pkg and 1 other directory.
by do-not-reply＠jboss.org
Author: dbaeli
Date: 2010-10-18 19:35:13 -0400 (Mon, 18 Oct 2010)
New Revision: 4720
Modified:
exo/portal/branches/3.1.x/packaging/pkg/pom.xml
exo/portal/branches/3.1.x/pom.xml
Log:
EXOGTN-106 declaring missing deps and maven repos for the build to pass, even if content is not perfect (still kernel 2.2.0-GA binaries downloaded. Clean fix for next release EXOGTN-115
Modified: exo/portal/branches/3.1.x/packaging/pkg/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/packaging/pkg/pom.xml 2010-10-18 22:53:52 UTC (rev 4719)
+++ exo/portal/branches/3.1.x/packaging/pkg/pom.xml 2010-10-18 23:35:13 UTC (rev 4720)
@@ -33,22 +33,6 @@
<properties>
<gatein.working.dir>${basedir}/target</gatein.working.dir><!-- Default value for server installation dir -->
-
- <commons-digester.version>1.8.1</commons-digester.version>
- <commons-dbcp.version>1.2.1</commons-dbcp.version>
- <asm.version>1.5.3</asm.version>
- <jcr.version>1.0</jcr.version>
- <stax.version>1.0</stax.version>
- <html-parser.version>1.6</html-parser.version>
- <org.jaxb2.version>0.1</org.jaxb2.version>
- <commons-httpclient.version>3.1</commons-httpclient.version>
- <org.gatein.pc.version>2.1.1-GA</org.gatein.pc.version>
- <org.gatein.wsrp.version>1.1.1-GA</org.gatein.wsrp.version>
- <com.sun.xml.bind.version>2.1.7</com.sun.xml.bind.version>
- <javassist.version>3.4.GA</javassist.version>
- <antlr.version>2.7.6rc1</antlr.version>
- <cglib.version>2.2</cglib.version>
-
</properties>
@@ -129,6 +113,8 @@
<dependency><groupId>javassist</groupId><artifactId>javassist</artifactId><version>${javassist.version}</version><type>jar</type></dependency><!-- 3.4.GA-->
<dependency><groupId>antlr</groupId><artifactId>antlr</artifactId><version>${antlr.version}</version><type>jar</type></dependency><!-- 2.7.6rc1-->
<dependency><groupId>cglib</groupId><artifactId>cglib</artifactId><version>${cglib.version}</version><type>jar</type></dependency><!-- 2.2-->
+<dependency><groupId>org.exoplatform.tool</groupId><artifactId>exo.tool.webunit</artifactId><version>${exo.tool.webunit.version}</version><type>jar</type></dependency><!-- 3.4.GA-->
+
</dependencies>
<build>
@@ -231,7 +217,7 @@
<argument>-Dexo.working.dir=${gatein.working.dir}</argument>
<!--argument>-Dexo.src.dir=NONE</argument-->
<argument>-Dexo.dep.dir=${exo.projects.directory.dependencies}</argument><!-- to get the server ref install -->
- <argument>-Dexo.m2.repos=file:${settings.localRepository}</argument>
+ <argument>-Dexo.m2.repos=file:${settings.localRepository},http://maven2.exoplatform.org/rest/maven2,http://repository.jboss.org/maven2</argument>
<argument>-Dclean.server=${exo.projects.app.jboss.version}</argument>
<argument>-Dexo.m2.home=${maven.home}</argument>
<argument>-Xms128m</argument>
@@ -332,7 +318,7 @@
<argument>-Dexo.working.dir=${gatein.working.dir}/</argument>
<!--argument>-Dexo.src.dir=NONE</argument-->
<argument>-Dexo.dep.dir=${exo.projects.directory.dependencies}</argument><!-- to get the server ref install -->
- <argument>-Dexo.m2.repos=file:${settings.localRepository}</argument>
+ <argument>-Dexo.m2.repos=file:${settings.localRepository},http://maven2.exoplatform.org/rest/maven2,http://repository.jboss.org/maven2</argument>
<argument>-Dclean.server=${exo.projects.app.tomcat.version}</argument>
<argument>-Dexo.m2.home=${maven.home}</argument>
<argument>-Xms128m</argument>
@@ -432,7 +418,7 @@
<argument>-Dexo.working.dir=${gatein.working.dir}</argument>
<!--argument>-Dexo.src.dir=NONE</argument-->
<argument>-Dexo.dep.dir=${exo.projects.directory.dependencies}</argument><!-- to get the server ref install -->
- <argument>-Dexo.m2.repos=file:${settings.localRepository}</argument>
+ <argument>-Dexo.m2.repos=file:${settings.localRepository},http://maven2.exoplatform.org/rest/maven2,http://repository.jboss.org/maven2</argument>
<argument>-Dclean.server=${exo.projects.app.jboss.version}</argument>
<argument>-Dexo.m2.home=${maven.home}</argument>
<argument>-Xms128m</argument>
@@ -531,7 +517,7 @@
<argument>-Dexo.working.dir=${gatein.working.dir}/</argument>
<!--argument>-Dexo.src.dir=NONE</argument-->
<argument>-Dexo.dep.dir=${exo.projects.directory.dependencies}</argument><!-- to get the server ref install -->
- <argument>-Dexo.m2.repos=file:${settings.localRepository}</argument>
+ <argument>-Dexo.m2.repos=file:${settings.localRepository},http://maven2.exoplatform.org/rest/maven2,http://repository.jboss.org/maven2</argument>
<argument>-Dclean.server=${exo.projects.app.tomcat.version}</argument>
<argument>-Dexo.m2.home=${maven.home}</argument>
<argument>-Xms128m</argument>
@@ -632,7 +618,7 @@
<argument>-Dexo.working.dir=${gatein.working.dir}</argument>
<!--argument>-Dexo.src.dir=NONE</argument-->
<argument>-Dexo.dep.dir=${exo.projects.directory.dependencies}</argument><!-- to get the server ref install -->
- <argument>-Dexo.m2.repos=file:${settings.localRepository}</argument>
+ <argument>-Dexo.m2.repos=file:${settings.localRepository},http://maven2.exoplatform.org/rest/maven2,http://repository.jboss.org/maven2</argument>
<argument>-Dclean.server=${exo.projects.app.jboss.version}</argument>
<argument>-Dexo.m2.home=${maven.home}</argument>
<argument>-Xms128m</argument>
Modified: exo/portal/branches/3.1.x/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/pom.xml 2010-10-18 22:53:52 UTC (rev 4719)
+++ exo/portal/branches/3.1.x/pom.xml 2010-10-18 23:35:13 UTC (rev 4720)
@@ -58,6 +58,22 @@
<version.chromattic>1.0.3</version.chromattic>
<version.reflect>1.0.0</version.reflect>
<jcip.version>1.0</jcip.version>
+
+ <!-- EXOGTN-106 : forced at packaging level -->
+ <antlr.version>2.7.6rc1</antlr.version>
+ <asm.version>1.5.3</asm.version>
+ <cglib.version>2.2</cglib.version>
+ <com.sun.xml.bind.version>2.1.7</com.sun.xml.bind.version>
+ <commons-digester.version>1.8.1</commons-digester.version>
+ <commons-dbcp.version>1.2.1</commons-dbcp.version>
+ <commons-httpclient.version>3.1</commons-httpclient.version>
+ <exo.tool.webunit.version>1.0.0</exo.tool.webunit.version>
+ <html-parser.version>1.6</html-parser.version>
+ <javassist.version>3.4.GA</javassist.version>
+ <jcr.version>1.0</jcr.version>
+ <org.jaxb2.version>0.1</org.jaxb2.version>
+ <stax.version>1.0</stax.version>
+
<!-- ************** -->
<!-- Build settings -->
<!-- ************** -->
13 years, 8 months
gatein SVN: r4719 - in exo/maven/packager/branches/1.0.x/src/main/javascript/eXo: projects and 1 other directory.
by do-not-reply＠jboss.org
Author: dbaeli
Date: 2010-10-18 18:53:52 -0400 (Mon, 18 Oct 2010)
New Revision: 4719
Modified:
exo/maven/packager/branches/1.0.x/src/main/javascript/eXo/System.js
exo/maven/packager/branches/1.0.x/src/main/javascript/eXo/projects/Product.js
exo/maven/packager/branches/1.0.x/src/main/javascript/eXo/projects/Project.js
Log:
EXOGTN-113 don't call maven dependency:get from exobuild, generate the depencies to add in the pom.xml
Modified: exo/maven/packager/branches/1.0.x/src/main/javascript/eXo/System.js
===================================================================
--- exo/maven/packager/branches/1.0.x/src/main/javascript/eXo/System.js 2010-10-18 22:50:41 UTC (rev 4718)
+++ exo/maven/packager/branches/1.0.x/src/main/javascript/eXo/System.js 2010-10-18 22:53:52 UTC (rev 4719)
@@ -22,7 +22,7 @@
for ( var i = tag.length + 2; i < 10; i++)
java.lang.System.out.print(" ");
- java.lang.System.out.println(message);
+ java.lang.System.out.println("" + message);
// var tmp = message.split("\n");
// java.lang.System.out.println(tmp[0]);
// for ( var j = 1; j < tmp.length; j++) {
Modified: exo/maven/packager/branches/1.0.x/src/main/javascript/eXo/projects/Product.js
===================================================================
--- exo/maven/packager/branches/1.0.x/src/main/javascript/eXo/projects/Product.js 2010-10-18 22:50:41 UTC (rev 4718)
+++ exo/maven/packager/branches/1.0.x/src/main/javascript/eXo/projects/Product.js 2010-10-18 22:53:52 UTC (rev 4719)
@@ -185,13 +185,23 @@
eXo.System.info("INFO", "Deploying dependencies");
var i = product.getDependencies().iterator();
counter = 0;
+ var failures = 0;
while (i.hasNext()) {
- dep = i.next();
- dep.deployTo(repos, server);
- server.onDeploy(dep);
- counter++;
+ try {
+ dep = i.next();
+ dep.deployTo(repos, server);
+ server.onDeploy(dep);
+ counter++;
+ } catch (err) {
+ failures++;
+ }
}
- eXo.System.info("INFO", "Deployed total " + counter + " files");
+ if (failures > 0) {
+ eXo.System.info("INFO", "Deployed total " + counter + " files");
+ throw("Missing " + failures + " dependencies please fix.");
+ } else {
+ eXo.System.info("INFO", "Deployed total " + counter + " files");
+ }
server.postDeploy(product);
}
return descriptor;
Modified: exo/maven/packager/branches/1.0.x/src/main/javascript/eXo/projects/Project.js
===================================================================
--- exo/maven/packager/branches/1.0.x/src/main/javascript/eXo/projects/Project.js 2010-10-18 22:50:41 UTC (rev 4718)
+++ exo/maven/packager/branches/1.0.x/src/main/javascript/eXo/projects/Project.js 2010-10-18 22:53:52 UTC (rev 4719)
@@ -132,10 +132,11 @@
try {
is = url.openStream();
} catch (err1) {
- eXo.System.info("Artifact " + this.artifact + " not found locally, searching in maven repos");
- var mvnArgs = ["dependency:get", "-Dartifact=" + this.artifact, "-Dmaven.artifact.threads=1"] ;
- maven.MavenTask(eXo.env.currentDir, mvnArgs).execute() ;
- }
+ eXo.System.info("Artifact " + this.artifact + " not found locally, please declare it in the pom.xml");
+ eXo.System.info("Missing dependency !");
+ eXo.System.info("<dependency><groupId>" + this.groupId + "</groupId><artifactId>" + this.artifactId + "</artifactId><version>${" + this.groupId +".version}</version><type>" + this.extension + "</type></dependency><!-- " + this.version + "-->") ;
+ throw("Error while deploying the project : " + this.relativePath) ;
+ }
//Fetch the binary on the server
var is = url.openStream() ;
@@ -163,7 +164,7 @@
eXo.System.info("DEPLOY", fileName);
return ;
} catch(err) {
- eXo.System.info(err.message);
+ eXo.System.info(err);
if(i < (repository.length - 1)) {
eXo.System.info("Trying to download from the repo : " + repository[i+1]);
}
13 years, 8 months
gatein SVN: r4718 - exo/maven/packager/branches/1.0.x/src/main/javascript/eXo/server.
by do-not-reply＠jboss.org
Author: dbaeli
Date: 2010-10-18 18:50:41 -0400 (Mon, 18 Oct 2010)
New Revision: 4718
Modified:
exo/maven/packager/branches/1.0.x/src/main/javascript/eXo/server/JbossEar.js
exo/maven/packager/branches/1.0.x/src/main/javascript/eXo/server/Tomcat.js
Log:
EXOGTN-110 Remove kernel-mc in GateIn packaging - wrong kernel version, no need for that to be deployed
Modified: exo/maven/packager/branches/1.0.x/src/main/javascript/eXo/server/JbossEar.js
===================================================================
--- exo/maven/packager/branches/1.0.x/src/main/javascript/eXo/server/JbossEar.js 2010-10-18 18:24:54 UTC (rev 4717)
+++ exo/maven/packager/branches/1.0.x/src/main/javascript/eXo/server/JbossEar.js 2010-10-18 22:50:41 UTC (rev 4718)
@@ -78,17 +78,18 @@
// product.removeDependency(new Project("quartz", "quartz", "jar",
// "1.5.0-RC2"));
- this.EXO_KERNEL_VER = "2.2.0-GA";
- product.addDependencies(new Project("org.jboss.mc-int", "jboss-mc-int-common", "jar", "2.2.0.Alpha2"));
- product.addDependencies(new Project("org.jboss.mc-int", "jboss-mc-int-servlet", "jar", "2.2.0.Alpha2"));
- product.addDependencies(new Project("org.exoplatform.kernel", "exo.kernel.mc-int", "jar", this.EXO_KERNEL_VER));
- product.addDependencies(new Project("org.exoplatform.kernel", "exo.kernel.mc-kernel-extras", "jar", this.EXO_KERNEL_VER));
+//EXOGTN-106 remove bad deps and un-needed
+// this.EXO_KERNEL_VER = "2.2.0-GA";
+// product.addDependencies(new Project("org.jboss.mc-int", "jboss-mc-int-common", "jar", "2.2.0.Alpha2"));
+// product.addDependencies(new Project("org.jboss.mc-int", "jboss-mc-int-servlet", "jar", "2.2.0.Alpha2"));
+// product.addDependencies(new Project("org.exoplatform.kernel", "exo.kernel.mc-int", "jar", this.EXO_KERNEL_VER));
+// product.addDependencies(new Project("org.exoplatform.kernel", "exo.kernel.mc-kernel-extras", "jar", this.EXO_KERNEL_VER));
- if (product.integrationTests) {
- this.MC_INT_DEMO_ARTIFACT = "exo.kernel.mc-int-demo";
- product.addDependencies(new Project("org.exoplatform.kernel", this.MC_INT_DEMO_ARTIFACT, "jar", this.EXO_KERNEL_VER));
- product.addDependencies(new Project("org.exoplatform.kernel", "exo.kernel.mc-int-tests", "war", this.EXO_KERNEL_VER));
- }
+// if (product.integrationTests) {
+// this.MC_INT_DEMO_ARTIFACT = "exo.kernel.mc-int-demo";
+// product.addDependencies(new Project("org.exoplatform.kernel", this.MC_INT_DEMO_ARTIFACT, "jar", this.EXO_KERNEL_VER));
+// product.addDependencies(new Project("org.exoplatform.kernel", "exo.kernel.mc-int-tests", "war", this.EXO_KERNEL_VER));
+// }
//var version = product.version;
//if (version.indexOf("2.0") != 0 && version.indexOf("2.1") != 0 && version.indexOf("2.2") != 0
Modified: exo/maven/packager/branches/1.0.x/src/main/javascript/eXo/server/Tomcat.js
===================================================================
--- exo/maven/packager/branches/1.0.x/src/main/javascript/eXo/server/Tomcat.js 2010-10-18 18:24:54 UTC (rev 4717)
+++ exo/maven/packager/branches/1.0.x/src/main/javascript/eXo/server/Tomcat.js 2010-10-18 22:50:41 UTC (rev 4718)
@@ -75,16 +75,17 @@
product.addDependencies(new Project("commons-pool", "commons-pool", "jar", "1.2"));
product.addDependencies(new Project("commons-dbcp", "commons-dbcp", "jar", "1.2.1"));
product.addDependencies(new Project("org.exoplatform.portal", "exo.portal.server.tomcat.plugin", "jar", product.serverPluginVersion));
- product.addDependencies(new Project("org.exoplatform.tool", "exo.tool.webunit", "jar", "1.0.0"));
+// product.addDependencies(new Project("org.exoplatform.tool", "exo.tool.webunit", "jar", "1.0.0"));
//GTNPORTAL-32 No WSRP on tomcat yet
product.removeDependency(new Project("org.exoplatform.portal", "exo.portal.component.wsrp", "jar", product.serverPluginVersion ));
product.removeDependencyByGroupId("org.gatein.wsrp");
- if (product.integrationTests) {
- product.addDependencies(new Project("org.exoplatform.kernel", "exo.kernel.mc-int-demo", "jar", "2.2.0-Beta05"));
- product.addDependencies(new Project("org.exoplatform.kernel", "exo.kernel.mc-int-tests", "war", "2.2.0-Beta05"));
- }
+//EXOGTN-106 remove bad deps and un-needed
+// if (product.integrationTests) {
+// product.addDependencies(new Project("org.exoplatform.kernel", "exo.kernel.mc-int-demo", "jar", "2.2.0-Beta05"));
+// product.addDependencies(new Project("org.exoplatform.kernel", "exo.kernel.mc-int-tests", "war", "2.2.0-Beta05"));
+// }
}
Tomcat.prototype.onDeploy = function(project) {
13 years, 8 months
gatein SVN: r4717 - in components/wsrp/trunk/consumer/src: test/java/org/gatein/wsrp/consumer and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-18 14:24:54 -0400 (Mon, 18 Oct 2010)
New Revision: 4717
Modified:
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java
components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/RegistrationInfoTestCase.java
Log:
- GTNWSRP-104: add version of WSRP to consumer name.
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java 2010-10-18 16:10:12 UTC (rev 4716)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java 2010-10-18 18:24:54 UTC (rev 4717)
@@ -24,6 +24,7 @@
package org.gatein.wsrp.consumer;
import org.gatein.common.util.ParameterValidation;
+import org.gatein.common.util.Version;
import org.gatein.pc.api.PortletInvokerException;
import org.gatein.wsrp.WSRPConstants;
import org.gatein.wsrp.WSRPTypeFactory;
@@ -419,7 +420,9 @@
// if we were previously undetermined, become determined! :)
if (isUndetermined())
{
- setConsumerName(WSRPConstants.DEFAULT_CONSUMER_NAME);
+ Version version = parent.getEndpointConfigurationInfo().getWSRPVersion();
+ String versionInfo = version != null ? " WSRP v" + version.getMajor() + " version" : " unknown WSRP version";
+ setConsumerName(WSRPConstants.DEFAULT_CONSUMER_NAME + versionInfo);
}
// get a service description if we don't already have one
Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/RegistrationInfoTestCase.java
===================================================================
--- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/RegistrationInfoTestCase.java 2010-10-18 16:10:12 UTC (rev 4716)
+++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/RegistrationInfoTestCase.java 2010-10-18 18:24:54 UTC (rev 4717)
@@ -50,7 +50,8 @@
protected void setUp() throws Exception
{
- info = new RegistrationInfo();
+ ProducerInfo pi = new ProducerInfo();
+ info = pi.getRegistrationInfo();
}
public void testInitialState()
13 years, 8 months
gatein SVN: r4716 - in portal/trunk: packaging/tomcat/pkg/src/main/resources/tomcat/bin and 1 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-10-18 12:10:12 -0400 (Mon, 18 Oct 2010)
New Revision: 4716
Modified:
portal/trunk/README.txt
portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/gatein-dev.sh
portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/gatein.sh
portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh
portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh
Log:
GTNPORTAL-1365 : Shell startup script can be parameterized by a JVM parameter (contributed by Henri Gomez)
Modified: portal/trunk/README.txt
===================================================================
--- portal/trunk/README.txt 2010-10-18 16:09:45 UTC (rev 4715)
+++ portal/trunk/README.txt 2010-10-18 16:10:12 UTC (rev 4716)
@@ -1,48 +1,50 @@
Welcome to GateIn:
===========================
-This will explain you how to build a package of GateIn with Tomcat or JBoss.
+This will explain you how to build a package of GateIn with Tomcat or JBoss.
*****************
* COMPILATION
*****************
* mvn install
-For example: mvn install
+For example: mvn install
Note: If you run "mvn install" twice in a row without cleaning, one test will
fail. To workaround this issue you will need to delete the test data located
here: component/portal/target/temp/
-**********************
-* MAVEN CONFIGURATION:
-**********************
-
-* edit packaging/profiles.xml and replace the values mentioned so that:
- * ${exo.projects.directory.dependencies} directory contains :
- ** ${exo.projects.app.tomcat.version}/ a clean Tomcat installation, to be used as packaging template
- ** ${exo.projects.app.jboss.version}/ a clean JBoss installation, to be used as packaging template
+**********************
+* MAVEN CONFIGURATION:
+**********************
+* edit packaging/profiles.xml and replace the values mentioned so that:
+ * ${exo.projects.directory.dependencies} directory contains :
+ ** ${exo.projects.app.tomcat.version}/ a clean Tomcat installation, to be used as packaging template
+ ** ${exo.projects.app.jboss.version}/ a clean JBoss installation, to be used as packaging template
+
* See http://maven.apache.org/guides/introduction/introduction-to-profiles.html for more informations
-
-Alternatively you can edit your local settings.xml to add the information
-provided in profiles.xml. It will override what's in the provided file.
-
-*****************
-* PACKAGING:
-*****************
+
+Alternatively you can edit your local settings.xml to add the information
+provided in profiles.xml. It will override what's in the provided file.
-* mvn install -Ppkg-tomcat
+*****************
+* PACKAGING:
+*****************
+
+* mvn install -Ppkg-tomcat
** Creates a Tomcat delivery in packaging/pkg/target/tomcat/
-
-* mvn install -Ppkg-jbossas
+
+* mvn install -Ppkg-jbossas
** Creates a JBossAS delivery in packaging/pkg/target/jboss/
-
-*****************
-* STARTING:
-*****************
-* On Tomcat: go to the tomcat directory (or unzip the archive in your favorite location) and execute 'bin/gatein.sh start' ('bin/gatein.bat start' on Windows)
-* On JBoss: go to the jboss directory (or unzip the archive in your favorite location) and execute 'bin/run.sh start' ('bin/run.bat start' on Windows)
-
-* Go to http://localhost:8080/portal to see the homepage of the portal. That's it.
+*****************
+* STARTING:
+*****************
+* On Tomcat: go to the tomcat directory (or unzip the archive in your favorite location) and execute 'bin/gatein.sh start' ('bin/gatein.bat start' on Windows)
+* Alternatively you can use the run command to execute GateIn in the current window 'bin/gatein.sh run' ('bin/gaete.bar run' on Windows)
+* The gatein.sh script can be passed additional arguments between the gatein.sh script and the tomcat command 'bin/gatein.sh -Dfoo=bar run'
+* On JBoss: go to the jboss directory (or unzip the archive in your favorite location) and execute 'bin/run.sh start' ('bin/run.bat start' on Windows)
+
+* Go to http://localhost:8080/portal to see the homepage of the portal. That's it.
+
Modified: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/gatein-dev.sh
===================================================================
--- portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/gatein-dev.sh 2010-10-18 16:09:45 UTC (rev 4715)
+++ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/gatein-dev.sh 2010-10-18 16:10:12 UTC (rev 4716)
@@ -24,23 +24,27 @@
# Sets some variables
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.name=gatein/conf"
+EXO_OPTS="-Dexo.product.developing=true -Dexo.conf.dir.name=gatein/conf -Djava.awt.headless=true"
EXO_CONFIG_OPTS="-Xms128m -Xmx512m -XX:MaxPermSize=256m -Dorg.exoplatform.container.configuration.debug"
-
JPDA_TRANSPORT=dt_socket
JPDA_ADDRESS=8000
-
REMOTE_DEBUG="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n"
-
JMX_AGENT="-Dcom.sun.management.jmxremote"
+GATEIN_OPTS=""
-#For profiling
-#LD_LIBRARY_PATH="/cygdrive/d/tools/YourKit/bin/win32/"
-#PATH="$PATH:$LD_LIBRARY_PATH"
-#export LD_LIBRARY_PATH
-#YOURKIT_PROFILE_OPTION="-agentlib:yjpagent -Djava.awt.headless=true"
+while getopts "D:" OPTION
+do
+ case $OPTION in
+ D)
+ GATEIN_OPTS="$GATEIN_OPTS -D$OPTARG"
+ ;;
+ esac
+done
-JAVA_OPTS="$YOURKIT_PROFILE_OPTION $JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS $EXO_CONFIG_OPTS $REMOTE_DEBUG"
+# skip getopt parms
+shift $((OPTIND-1))
+
+JAVA_OPTS="$JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS $EXO_CONFIG_OPTS $REMOTE_DEBUG $GATEIN_OPTS"
export JAVA_OPTS
# Launches the server
Modified: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/gatein.sh
===================================================================
--- portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/gatein.sh 2010-10-18 16:09:45 UTC (rev 4715)
+++ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/gatein.sh 2010-10-18 16:10:12 UTC (rev 4716)
@@ -1,17 +1,17 @@
#!/bin/sh
#
# Copyright (C) 2009 eXo Platform SAS.
-#
+#
# 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
@@ -27,9 +27,22 @@
# Sets some variables
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=false -Dexo.conf.dir.name=gatein/conf"
+EXO_OPTS="-Dexo.product.developing=false -Dexo.conf.dir.name=gatein/conf -Djava.awt.headless=true"
+GATEIN_OPTS=""
-JAVA_OPTS="-Xms128m -Xmx384m -XX:MaxPermSize=192m $JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS"
+while getopts "D:" OPTION
+do
+ case $OPTION in
+ D)
+ GATEIN_OPTS="$GATEIN_OPTS -D$OPTARG"
+ ;;
+ esac
+done
+
+# skip getopt parms
+shift $((OPTIND-1))
+
+JAVA_OPTS="-Xms128m -Xmx384m -XX:MaxPermSize=192m $JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS $GATEIN_OPTS"
export JAVA_OPTS
# Launches the server
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-10-18 16:09:45 UTC (rev 4715)
+++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh 2010-10-18 16:10:12 UTC (rev 4716)
@@ -26,21 +26,25 @@
SECURITY_OPTS="-Djava.security.auth.login.config=../conf/jaas.conf"
EXO_OPTS="-Dexo.product.developing=true -Dexo.conf.dir.name=gatein/conf -Djava.awt.headless=true"
EXO_CONFIG_OPTS="-Xms128m -Xmx512m -XX:MaxPermSize=256m -Dorg.exoplatform.container.configuration.debug"
-
JPDA_TRANSPORT=dt_socket
JPDA_ADDRESS=8000
-
REMOTE_DEBUG="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n"
-
JMX_AGENT="-Dcom.sun.management.jmxremote"
+GATEIN_OPTS=""
-#For profiling
-#LD_LIBRARY_PATH="/cygdrive/d/tools/YourKit/bin/win32/"
-#PATH="$PATH:$LD_LIBRARY_PATH"
-#export LD_LIBRARY_PATH
-#YOURKIT_PROFILE_OPTION="-agentlib:yjpagent -Djava.awt.headless=true"
+while getopts "D:" OPTION
+do
+ case $OPTION in
+ D)
+ GATEIN_OPTS="$GATEIN_OPTS -D$OPTARG"
+ ;;
+ esac
+done
-JAVA_OPTS="$YOURKIT_PROFILE_OPTION $JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS $EXO_CONFIG_OPTS $REMOTE_DEBUG"
+# skip getopt parms
+shift $((OPTIND-1))
+
+JAVA_OPTS="$JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS $EXO_CONFIG_OPTS $REMOTE_DEBUG $GATEIN_OPTS"
export JAVA_OPTS
# Launches the server
Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh
===================================================================
--- portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh 2010-10-18 16:09:45 UTC (rev 4715)
+++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh 2010-10-18 16:10:12 UTC (rev 4716)
@@ -28,8 +28,21 @@
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=false -Dexo.conf.dir.name=gatein/conf -Djava.awt.headless=true"
+GATEIN_OPTS=""
-JAVA_OPTS="-Xms128m -Xmx384m -XX:MaxPermSize=192m $JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS"
+while getopts "D:" OPTION
+do
+ case $OPTION in
+ D)
+ GATEIN_OPTS="$GATEIN_OPTS -D$OPTARG"
+ ;;
+ esac
+done
+
+# skip getopt parms
+shift $((OPTIND-1))
+
+JAVA_OPTS="-Xms128m -Xmx384m -XX:MaxPermSize=192m $JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS $GATEIN_OPTS"
export JAVA_OPTS
# Launches the server
13 years, 8 months