You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2005/08/05 21:21:50 UTC
svn commit: r230504 - in /geronimo/trunk: applications/console-core/
applications/console-ear/ applications/console-ear/src/plan/
applications/console-framework/ applications/console-standard/ etc/
modules/assembly/ modules/assembly/src/var/config/ san...
Author: jboynes
Date: Fri Aug 5 12:20:46 2005
New Revision: 230504
URL: http://svn.apache.org/viewcvs?rev=230504&view=rev
Log:
move console into main build
Added:
geronimo/trunk/applications/console-core/
- copied from r227466, geronimo/trunk/sandbox/console-core/
geronimo/trunk/applications/console-ear/
- copied from r227466, geronimo/trunk/sandbox/console-ear/
geronimo/trunk/applications/console-framework/
- copied from r227466, geronimo/trunk/sandbox/console-framework/
geronimo/trunk/applications/console-standard/
- copied from r227466, geronimo/trunk/sandbox/console-standard/
Removed:
geronimo/trunk/sandbox/console-core/
geronimo/trunk/sandbox/console-ear/
geronimo/trunk/sandbox/console-framework/
geronimo/trunk/sandbox/console-standard/
Modified:
geronimo/trunk/applications/console-ear/project.xml
geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml
geronimo/trunk/applications/console-framework/maven.xml
geronimo/trunk/applications/console-framework/project.properties
geronimo/trunk/applications/console-framework/project.xml
geronimo/trunk/applications/console-standard/project.xml
geronimo/trunk/etc/project.properties
geronimo/trunk/modules/assembly/maven.xml
geronimo/trunk/modules/assembly/project.xml
geronimo/trunk/modules/assembly/src/var/config/config.list
Modified: geronimo/trunk/applications/console-ear/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-ear/project.xml?rev=230504&r1=227466&r2=230504&view=diff
==============================================================================
--- geronimo/trunk/applications/console-ear/project.xml (original)
+++ geronimo/trunk/applications/console-ear/project.xml Fri Aug 5 12:20:46 2005
@@ -33,12 +33,6 @@
<version>${pluto_version}</version>
</dependency>
- <dependency>
- <groupId>pluto</groupId>
- <artifactId>pluto-portal</artifactId>
- <version>${pluto_version}</version>
- </dependency>
-
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-console-core</artifactId>
Modified: geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml?rev=230504&r1=227466&r2=230504&view=diff
==============================================================================
--- geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml (original)
+++ geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml Fri Aug 5 12:20:46 2005
@@ -11,12 +11,7 @@
<dependency>
<uri>pluto/jars/pluto-${pluto_version}.jar</uri>
</dependency>
- <dependency>
- <uri>pluto/jars/pluto-portal-${pluto_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>castor/jars/castor-${castor_version}.jar</uri>
- </dependency>
+
<!-- Active MQ dependencies -->
<dependency>
<uri>activemq/jars/activemq-core-${activemq_version}.jar</uri>
Modified: geronimo/trunk/applications/console-framework/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/maven.xml?rev=230504&r1=227466&r2=230504&view=diff
==============================================================================
--- geronimo/trunk/applications/console-framework/maven.xml (original)
+++ geronimo/trunk/applications/console-framework/maven.xml Fri Aug 5 12:20:46 2005
@@ -5,7 +5,15 @@
xmlns:define="jelly:define"
xmlns:velocity="jelly:velocity"
xmlns:util="jelly:util">
-
+
+ <postGoal name="war:war">
+ <ant:unjar dest="${basedir}/target/${pom.artifactId}" src="${maven.repo.local}/pluto/wars/pluto-driver-${pluto_version}.war" overwrite="true">
+ <patternset>
+ <include name="WEB-INF/classes/**"/>
+ </patternset>
+ </ant:unjar>
+ </postGoal>
+
<preGoal name="war:install">
<attainGoal name="preCompile"/>
</preGoal>
@@ -26,7 +34,7 @@
<goal name="preCompile">
<ant:path id="jspc.classpath">
<ant:path refid="maven.dependency.classpath"/>
- <ant:pathelement path="${maven.build.dest}"/>
+ <ant:pathelement path="${basedir}/target/${pom.artifactId}/WEB-INF/classes"/>
</ant:path>
<ant:echo>Pre-compiling JSPs from ${basedir}/src/webapp to ${outDir}.</ant:echo>
<ant:java classname="org.apache.jasper.JspC" fork="true" failonerror="true" classpathref="jspc.classpath">
Modified: geronimo/trunk/applications/console-framework/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/project.properties?rev=230504&r1=227466&r2=230504&view=diff
==============================================================================
--- geronimo/trunk/applications/console-framework/project.properties (original)
+++ geronimo/trunk/applications/console-framework/project.properties Fri Aug 5 12:20:46 2005
@@ -1 +1,2 @@
+maven.repo.remote=http://cvs.apache.org/repository,http://people.apache.org/~jboynes
maven.multiproject.type=war
Modified: geronimo/trunk/applications/console-framework/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/project.xml?rev=230504&r1=227466&r2=230504&view=diff
==============================================================================
--- geronimo/trunk/applications/console-framework/project.xml (original)
+++ geronimo/trunk/applications/console-framework/project.xml Fri Aug 5 12:20:46 2005
@@ -50,11 +50,12 @@
<artifactId>pluto</artifactId>
<version>${pluto_version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>pluto</groupId>
- <artifactId>pluto-portal</artifactId>
+ <artifactId>pluto-driver</artifactId>
+ <type>war</type>
<version>${pluto_version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>castor</groupId>
<artifactId>castor</artifactId>
Modified: geronimo/trunk/applications/console-standard/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/project.xml?rev=230504&r1=227466&r2=230504&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/project.xml (original)
+++ geronimo/trunk/applications/console-standard/project.xml Fri Aug 5 12:20:46 2005
@@ -107,11 +107,6 @@
<version>${pluto_version}</version>
</dependency>
<dependency>
- <groupId>pluto</groupId>
- <artifactId>pluto-portal</artifactId>
- <version>${pluto_version}</version>
- </dependency>
- <dependency>
<groupId>castor</groupId>
<artifactId>castor</artifactId>
<version>${castor_version}</version>
Modified: geronimo/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?rev=230504&r1=230503&r2=230504&view=diff
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Fri Aug 5 12:20:46 2005
@@ -145,7 +145,7 @@
mockobjects_version=0.09
mx4j_version=3.0.1
oro_version=2.0.8
-pluto_version=1.0.1-rc2
+pluto_version=1.0.1-rc3
portlet_api_version=1.0
p2psockets_version=1.1.2
regexp_version=1.3
Modified: geronimo/trunk/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?rev=230504&r1=230503&r2=230504&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Fri Aug 5 12:20:46 2005
@@ -562,6 +562,17 @@
<ant:arg value="${maven.repo.local}/geronimo/wars/geronimo-uddi-server-${pom.currentVersion}.war"/>
</ant:java>
+ <ant:echo>Building console configuration</ant:echo>
+ <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
+ <ant:jvmarg value="-ea"/>
+ <ant:arg value="--user"/>
+ <ant:arg value="system"/>
+ <ant:arg value="--password"/>
+ <ant:arg value="manager"/>
+ <ant:arg value="distribute"/>
+ <ant:arg value="${maven.repo.local}/geronimo/ears/geronimo-console-${pom.currentVersion}.ear"/>
+ </ant:java>
+
<!-- create SystemDatabase -->
<!-- <attainGoal name="init-database"/>-->
Modified: geronimo/trunk/modules/assembly/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.xml?rev=230504&r1=230503&r2=230504&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml (original)
+++ geronimo/trunk/modules/assembly/project.xml Fri Aug 5 12:20:46 2005
@@ -1190,6 +1190,44 @@
</properties>
</dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-console</artifactId>
+ <version>${pom.currentVersion}</version>
+ <type>ear</type>
+ <properties>
+ <repository>true</repository>
+ <installer>true</installer>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-console-core</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>${portlet_api_version}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>pluto</groupId>
+ <artifactId>pluto</artifactId>
+ <version>${pluto_version}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
<!-- JBI ServiceMix -->
<dependency>
<groupId>geronimo</groupId>
Modified: geronimo/trunk/modules/assembly/src/var/config/config.list
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/var/config/config.list?rev=230504&r1=230503&r2=230504&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/var/config/config.list (original)
+++ geronimo/trunk/modules/assembly/src/var/config/config.list Fri Aug 5 12:20:46 2005
@@ -3,3 +3,4 @@
org/apache/geronimo/SystemDatabase
org/apache/geronimo/SystemJMS
org/apache/geronimo/RuntimeDeployer
+org/apache/geronimo/Console