3:35 a.m.
Author: mstruk
Date: 2009-12-21 04:35:38 -0500 (Mon, 21 Dec 2009)
New Revision: 1089
Modified:
tools/packager/branches/mc-integration/pom.xml
tools/packager/branches/mc-integration/src/main/javascript/eXo/server/Database.js
tools/packager/branches/mc-integration/src/main/javascript/eXo/server/JbossEar.js
tools/packager/branches/mc-integration/src/main/javascript/eXo/server/Tomcat.js
Log:
Changed to deploy the released mc-integration artifacts + merged changes from trunk
Modified: tools/packager/branches/mc-integration/pom.xml
===================================================================
--- tools/packager/branches/mc-integration/pom.xml 2009-12-21 09:28:15 UTC (rev 1088)
+++ tools/packager/branches/mc-integration/pom.xml 2009-12-21 09:35:38 UTC (rev 1089)
@@ -1,110 +1,110 @@
-<!--
-
- 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
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.gatein</groupId>
- <artifactId>gatein-parent</artifactId>
- <version>1.0.0-Beta03</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.gatein.tools</groupId>
- <artifactId>packager</artifactId>
- <version>1.0.0-Beta03-SNAPSHOT</version>
- <name>GateIn Packager</name>
- <packaging>pom</packaging>
- <scm>
-
<connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/tools/package...
-
<developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/tools/p...
-
<url>http://fisheye.jboss.org/browse/gatein/tools/packager/trunk</ur...
- </scm>
-
- <!-- **************** -->
- <!-- Build Definition -->
- <!-- **************** -->
-
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <layout>default</layout>
- <url>http://snapshots.jboss.org/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
- <build>
- <plugins>
- <!-- exobuild packaging -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals><goal>assembly</goal></goals>
- </execution>
- </executions>
- <configuration>
-
<descriptors><descriptor>src/assemble/exopackage-zip.xml</descriptor></descriptors>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.4</version>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
-
<file>target/${project.artifactId}-${project.version}.zip</file>
- <type>zip</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-
-</project>
+<!--
+
+ 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
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.gatein</groupId>
+ <artifactId>gatein-parent</artifactId>
+ <version>1.0.0-Beta04</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.gatein.tools</groupId>
+ <artifactId>packager</artifactId>
+ <version>1.0.0-Beta05-SNAPSHOT</version>
+ <name>GateIn Packager</name>
+ <packaging>pom</packaging>
+ <scm>
+
<connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/tools/package...
+
<developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/tools/p...
+
<url>http://fisheye.jboss.org/browse/gatein/tools/packager/trunk</ur...
+ </scm>
+
+ <!-- **************** -->
+ <!-- Build Definition -->
+ <!-- **************** -->
+
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshots Repository</name>
+ <layout>default</layout>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
+ <build>
+ <plugins>
+ <!-- exobuild packaging -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals><goal>assembly</goal></goals>
+ </execution>
+ </executions>
+ <configuration>
+
<descriptors><descriptor>src/assemble/exopackage-zip.xml</descriptor></descriptors>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+
<file>target/${project.artifactId}-${project.version}.zip</file>
+ <type>zip</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+
+</project>
Modified:
tools/packager/branches/mc-integration/src/main/javascript/eXo/server/Database.js
===================================================================
---
tools/packager/branches/mc-integration/src/main/javascript/eXo/server/Database.js 2009-12-21
09:28:15 UTC (rev 1088)
+++
tools/packager/branches/mc-integration/src/main/javascript/eXo/server/Database.js 2009-12-21
09:35:38 UTC (rev 1089)
@@ -121,7 +121,7 @@
instance.driverClass = "org.hsqldb.jdbcDriver";
instance.dialect = "org.hibernate.dialect.HSQLDialect" ;
- instance.conectionURL = "jdbc:hsqldb:file:../temp/data/exodb";
+ instance.conectionURL =
"jdbc:hsqldb:file:${gatein.db.data.dir}/data/exodb${container.name.suffix}";
instance.username = "sa" ;
instance.password = "";
return instance ;
Modified:
tools/packager/branches/mc-integration/src/main/javascript/eXo/server/JbossEar.js
===================================================================
---
tools/packager/branches/mc-integration/src/main/javascript/eXo/server/JbossEar.js 2009-12-21
09:28:15 UTC (rev 1088)
+++
tools/packager/branches/mc-integration/src/main/javascript/eXo/server/JbossEar.js 2009-12-21
09:35:38 UTC (rev 1089)
@@ -76,32 +76,31 @@
// product.removeDependency(new Project("quartz", "quartz",
"jar",
// "1.5.0-RC2"));
- this.EXO_KERNEL_VER = "2.2.0-Beta05-SNAPSHOT";
+ this.EXO_KERNEL_VER = "2.2.0-Beta05";
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.demos.mc-injection";
- product.addDependencies(new Project("org.exoplatform.kernel.demos",
this.MC_INT_DEMO_ARTIFACT, "jar", this.EXO_KERNEL_VER));
- product.addDependencies(new Project("org.exoplatform.kernel.tests",
"exo.kernel.integration-tests", "war", this.EXO_KERNEL_VER));
+ 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
- && version.indexOf("2.5") != 0) {
- product.addDependencies(new Project("org.slf4j", "slf4j-api",
"jar", "1.5.6"));
- product.addDependencies(new Project("org.slf4j", "slf4j-log4j12",
"jar", "1.5.6"));
- }
+ //var version = product.version;
+ //if (version.indexOf("2.0") != 0 && version.indexOf("2.1")
!= 0 && version.indexOf("2.2") != 0
+ // && version.indexOf("2.5") != 0) {
+ // product.addDependencies(new Project("org.slf4j", "slf4j-api",
"jar", "1.5.6"));
+ // product.addDependencies(new Project("org.slf4j",
"slf4j-log4j12", "jar", "1.5.6"));
+ //}
// Above 2.5 we don't bundle JOTM anymore
- var version = product.version;
- if (version.indexOf("2.0") != 0 && version.indexOf("2.1")
!= 0 && version.indexOf("2.2") != 0) {
+ //var version = product.version;
+ //if (version.indexOf("2.0") != 0 && version.indexOf("2.1")
!= 0 && version.indexOf("2.2") != 0) {
product.removeDependency(new Project("jotm", "jotm_jrmp_stubs",
"jar", "2.0.10"));
product.removeDependency(new Project("jotm", "jotm",
"jar", "2.0.10"));
- }
+ //}
// Remove hibernate libs for JBoss AS5
if (this.exoJBoss5) {
@@ -148,7 +147,6 @@
var fromFile = new java.io.File(libDir, this.MC_INT_DEMO_ARTIFACT + "-" +
this.EXO_KERNEL_VER + ".jar");
eXo.core.IOUtil.cp(fromFile.getAbsolutePath(), this.deployEarDir);
eXo.core.IOUtil.remove(fromFile);
-
}
eXo.core.IOUtil.chmodExecutableInDir(this.serverHome + "/bin/",
".sh");
Modified: tools/packager/branches/mc-integration/src/main/javascript/eXo/server/Tomcat.js
===================================================================
---
tools/packager/branches/mc-integration/src/main/javascript/eXo/server/Tomcat.js 2009-12-21
09:28:15 UTC (rev 1088)
+++
tools/packager/branches/mc-integration/src/main/javascript/eXo/server/Tomcat.js 2009-12-21
09:35:38 UTC (rev 1089)
@@ -80,8 +80,8 @@
product.removeDependencyByGroupId("org.gatein.wsrp");
if (product.integrationTests) {
- product.addDependencies(new Project("org.exoplatform.kernel.demos",
"exo.kernel.demos.mc-injection", "jar",
"2.2.0-Beta05-SNAPSHOT"));
- product.addDependencies(new Project("org.exoplatform.kernel.tests",
"exo.kernel.integration-tests", "war",
"2.2.0-Beta05-SNAPSHOT"));
+ 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"));
}
}