You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2011/04/27 01:19:00 UTC
svn commit: r1096951 [3/6] - in /geronimo/server/trunk: ./ framework/
framework/assemblies/ framework/assemblies/geronimo-framework/
framework/buildsupport/car-maven-plugin/src/main/filtered-resources/resources/etc/
framework/buildsupport/car-maven-plu...
Modified: geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml Tue Apr 26 23:18:49 2011
@@ -32,11 +32,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.gogo.runtime</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>jaxb-impl</artifactId>
<type>jar</type>
@@ -132,26 +127,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.util</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.jaas</groupId>
- <artifactId>org.apache.karaf.jaas.boot</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.jaas</groupId>
- <artifactId>org.apache.karaf.jaas.config</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.jaas</groupId>
- <artifactId>org.apache.karaf.jaas.modules</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
<type>jar</type>
@@ -211,14 +186,4 @@
<artifactId>pax-logging-api</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/framework/configs/shutdown/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/shutdown/src/main/plan/plan.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/shutdown/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/shutdown/src/main/plan/plan.xml Tue Apr 26 23:18:49 2011
@@ -20,38 +20,38 @@
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
- <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
+ <!--<gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>-->
- <gbean name="Repository" class="org.apache.geronimo.system.repository.Maven2Repository">
- <attribute name="root">repository/</attribute>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
- </gbean>
-
- <gbean name="Local" class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore">
- <reference name="Repository">
- <name>Repository</name>
- </reference>
- </gbean>
-
- <gbean name="ArtifactManager" class="org.apache.geronimo.kernel.repository.DefaultArtifactManager"/>
-
- <gbean name="ArtifactResolver" class="org.apache.geronimo.kernel.repository.DefaultArtifactResolver">
- <reference name="ArtifactManager">
- <name>ArtifactManager</name>
- </reference>
- <reference name="Repositories"></reference>
- </gbean>
-
- <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.SimpleConfigurationManager">
- <reference name="Repositories"></reference>
- <reference name="Stores"></reference>
- <reference name="Watchers"></reference>
- <reference name="ArtifactResolver">
- <name>ArtifactResolver</name>
- </reference>
- </gbean>
+ <!--<gbean name="Repository" class="org.apache.geronimo.system.repository.Maven2Repository">-->
+ <!--<attribute name="root">repository/</attribute>-->
+ <!--<reference name="ServerInfo">-->
+ <!--<name>ServerInfo</name>-->
+ <!--</reference>-->
+ <!--</gbean>-->
+
+ <!--<gbean name="Local" class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore">-->
+ <!--<reference name="Repository">-->
+ <!--<name>Repository</name>-->
+ <!--</reference>-->
+ <!--</gbean>-->
+
+ <!--<gbean name="ArtifactManager" class="org.apache.geronimo.kernel.repository.DefaultArtifactManager"/>-->
+
+ <!--<gbean name="ArtifactResolver" class="org.apache.geronimo.kernel.repository.DefaultArtifactResolver">-->
+ <!--<reference name="ArtifactManager">-->
+ <!--<name>ArtifactManager</name>-->
+ <!--</reference>-->
+ <!--<reference name="Repositories"></reference>-->
+ <!--</gbean>-->
+
+ <!--<gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.SimpleConfigurationManager">-->
+ <!--<reference name="Repositories"></reference>-->
+ <!--<reference name="Stores"></reference>-->
+ <!--<reference name="Watchers"></reference>-->
+ <!--<reference name="ArtifactResolver">-->
+ <!--<name>ArtifactResolver</name>-->
+ <!--</reference>-->
+ <!--</gbean>-->
<gbean name="StopServer" class="org.apache.geronimo.deployment.cli.StopServer"/>
Copied: geronimo/server/trunk/framework/features/client-system/pom.xml (from r1096950, geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client-system/pom.xml?p2=geronimo/server/trunk/framework/features/client-system/pom.xml&p1=geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml (original)
+++ geronimo/server/trunk/framework/features/client-system/pom.xml Tue Apr 26 23:18:49 2011
@@ -23,27 +23,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>configs</artifactId>
+ <groupId>org.apache.geronimo.framework.feature</groupId>
+ <artifactId>feature</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
- <artifactId>jsr88-cli</artifactId>
- <name>Geronimo Framework, Configs :: JSR-88 CLI</name>
- <packaging>car</packaging>
+ <artifactId>client-system</artifactId>
+ <name>Geronimo Framework, Feature :: Client System</name>
+ <packaging>feature</packaging>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
- <type>car</type>
- <scope>provided</scope>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-common</artifactId>
<version>${project.version}</version>
</dependency>
@@ -61,78 +53,66 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-cli</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-tool</artifactId>
- <version>${project.version}</version>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-config</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-jexl</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
</dependency>
- <!--<dependency>-->
- <!--<groupId>commons-cli</groupId>-->
- <!--<artifactId>commons-cli</artifactId>-->
- <!--</dependency>-->
-
<!-- used by plugin installer -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxb_2.2_spec</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.2_spec</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>woodstox</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-pax-logging</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-reflect</artifactId>
+ </dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <configuration>
- <category>Deployment</category>
- <instance>
- <plugin-artifact>
- <config-xml-content server="jsr88" />
- </plugin-artifact>
- </instance>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
-
Copied: geronimo/server/trunk/framework/features/client-system/src/main/history/dependencies.xml (from r1096950, geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client-system/src/main/history/dependencies.xml?p2=geronimo/server/trunk/framework/features/client-system/src/main/history/dependencies.xml&p1=geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/features/client-system/src/main/history/dependencies.xml Tue Apr 26 23:18:49 2011
@@ -2,7 +2,7 @@
<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
<module-id>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
+ <artifactId>client-system</artifactId>
<version>3.0-SNAPSHOT</version>
<type>car</type>
</module-id>
@@ -58,16 +58,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-config</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deployment</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
<type>jar</type>
</dependency>
@@ -78,11 +68,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-service-builder</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-system</artifactId>
<type>jar</type>
</dependency>
@@ -93,11 +78,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxb_2.2_spec</artifactId>
<type>jar</type>
</dependency>
@@ -123,16 +103,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
<type>jar</type>
</dependency>
Copied: geronimo/server/trunk/framework/features/client-system/src/main/plan/plan.xml (from r1096950, geronimo/server/trunk/framework/configs/client-system/src/main/plan/plan.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client-system/src/main/plan/plan.xml?p2=geronimo/server/trunk/framework/features/client-system/src/main/plan/plan.xml&p1=geronimo/server/trunk/framework/configs/client-system/src/main/plan/plan.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
(empty)
Added: geronimo/server/trunk/framework/features/client-system/src/main/resources/META-INF/startup-jar
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client-system/src/main/resources/META-INF/startup-jar?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/client-system/src/main/resources/META-INF/startup-jar (added)
+++ geronimo/server/trunk/framework/features/client-system/src/main/resources/META-INF/startup-jar Tue Apr 26 23:18:49 2011
@@ -0,0 +1,18 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+This file tells the Geronimo bootstrap where to look for its installation
+directory, which is ../ from wherever the jar containing this file lives.
\ No newline at end of file
Copied: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/pom.xml (from r1096950, geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/geronimo-gbean-deployer/pom.xml?p2=geronimo/server/trunk/framework/features/geronimo-gbean-deployer/pom.xml&p1=geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml (original)
+++ geronimo/server/trunk/framework/features/geronimo-gbean-deployer/pom.xml Tue Apr 26 23:18:49 2011
@@ -23,63 +23,43 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>configs</artifactId>
+ <groupId>org.apache.geronimo.framework.feature</groupId>
+ <artifactId>feature</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
- <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
- <name>Geronimo Framework, Configs :: GBean Deployer Boostrap</name>
- <packaging>car</packaging>
+ <artifactId>geronimo-gbean-deployer</artifactId>
+ <name>Geronimo Framework, Feature :: GBean Deployer</name>
+ <!-- kar for schema content -->
+ <packaging>kar</packaging>
+
+ <description>
+ The GBean Deployer
+ </description>
<dependencies>
- <!-- N.B. ordering is crucial until maven dependencies express the osgi dependencies. xmlbeans requires xml-resolver -->
- <!-- required for environment dconfigbean support -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
- </dependency>
-
- <!-- Thirdparty Dependencies -->
-
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.2_spec</artifactId>
- </dependency>
-
- <!-- needed by the plan -->
- <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deployment</artifactId>
<version>${project.version}</version>
</dependency>
- <!-- jsr88 dconfigbean support base classes -->
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-config</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-common</artifactId>
+ <artifactId>geronimo-service-builder</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-service-builder</artifactId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
+ <artifactId>plugin</artifactId>
<version>${project.version}</version>
+ <type>car</type>
</dependency>
</dependencies>
@@ -87,16 +67,30 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <configuration>
- <deploymentConfigs>
- </deploymentConfigs>
- <bootstrap>true</bootstrap>
- <category>Geronimo Core</category>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/resources/schema</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <includes>**/*.xsd</includes>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
+
</project>
Added: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/goals.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/goals.txt?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/goals.txt (added)
+++ geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/goals.txt Tue Apr 26 23:18:49 2011
@@ -0,0 +1 @@
+org.apache.geronimo.buildsupport:car-maven-plugin:validate-configuration org.apache.geronimo.buildsupport:car-maven-plugin:prepare-plan org.apache.geronimo.buildsupport:car-maven-plugin:prepare-metadata
Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/goals.txt
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/goals.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml (from r1096950, geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml?p2=geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml&p1=geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml (original)
+++ geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml Tue Apr 26 23:18:49 2011
@@ -31,7 +31,7 @@
<groupId>org.apache.geronimo.buildsupport.it</groupId>
<artifactId>j2ee-system-it1</artifactId>
<name>Geronimo Configs :: J2EE System IT1</name>
- <packaging>car</packaging>
+ <packaging>feature</packaging>
<dependencies>
<dependency>
Copied: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/plan/plan.xml (from r1096950, geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/plan/plan.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/plan/plan.xml?p2=geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/plan/plan.xml&p1=geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/plan/plan.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/plan/plan.xml Tue Apr 26 23:18:49 2011
@@ -16,10 +16,20 @@
limitations under the License.
-->
-<!-- $Rev$ $Date$ -->
+<!--
+Configuration for the innermost ring of a Geronimo server.
+This module should only contain critical services needed to
+run other Configurations - for example, the ServerInfo, Logging
+and Repository services used to load them.
+
+This module should *NOT* be used to provide server or application
+specific services - those should be provided by children.
+-->
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+ <gbean name="EmbeddedDaemon" class="org.apache.geronimo.system.main.EmbeddedDaemon"/>
+
<!-- ServerInfo service -->
<gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
@@ -31,6 +41,11 @@
</reference>
</gbean>
+ <!-- Pinged and changed when the server completes loading when all the persistent configuration is loaded -->
+ <gbean name="ServerStatus" class="org.apache.geronimo.system.main.ServerStatusGBean">
+ <attribute name="serverStarted">false</attribute>
+ </gbean>
+
<!--Configuration Store service-->
<gbean name="Local" class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore">
<reference name="Repository">
@@ -43,8 +58,7 @@
<reference name="ServerInfo">
<name>ServerInfo</name>
</reference>
- <attribute name="readOnly">true</attribute>
- <attribute name="configFile">var/config/jsr88-configurer-config.xml</attribute>
+ <attribute name="configFile">var/config/config.xml</attribute>
<attribute name="substitutionsFile">var/config/config-substitutions.properties</attribute>
<attribute name="substitutionPrefix">org.apache.geronimo.config.substitution.</attribute>
</gbean>
@@ -65,7 +79,7 @@
</gbean>
<!--Configuration Manager service-->
- <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.KernelConfigurationManager">
+ <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.EditableKernelConfigurationManager">
<reference name="Repositories"></reference>
<reference name="Stores"></reference>
<reference name="Watchers"></reference>
@@ -85,14 +99,9 @@
</gbean>
<!-- Logging service -->
- <!--
- <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
- <attribute name="configFileName">var/log/deployer-log4j.properties</attribute>
+ <gbean name="Logger" class="org.apache.geronimo.system.logging.OSGILogServiceWrapper">
+ <attribute name="configFileName">var/log/server-log4j.properties</attribute>
<attribute name="refreshPeriodSeconds">60</attribute>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
</gbean>
- -->
</module>
Added: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/resources/META-INF/startup-jar
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/resources/META-INF/startup-jar?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/resources/META-INF/startup-jar (added)
+++ geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/main/resources/META-INF/startup-jar Tue Apr 26 23:18:49 2011
@@ -0,0 +1,18 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+This file tells the Geronimo bootstrap where to look for its installation
+directory, which is ../ from wherever the jar containing this file lives.
\ No newline at end of file
Added: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml (added)
+++ geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml Tue Apr 26 23:18:49 2011
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+ <name>Geronimo Configs :: J2EE System</name>
+ <category>Geronimo Core</category>
+ <description>Apache Geronimo, the JavaEE server project of the Apache Software Foundation.</description>
+ <url>http://geronimo.apache.org/</url>
+ <author>The Apache Geronimo development community</author>
+ <license osi-approved="true">The Apache Software License, Version 2.0</license>
+ <plugin-artifact>
+ <module-id>
+ <groupId>org.apache.geronimo.buildsupport.it</groupId>
+ <artifactId>j2ee-system</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ <type>car</type>
+ </module-id>
+ <dependency start="false">
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.1.7</version>
+ <type>jar</type>
+ </dependency>
+ <dependency start="false">
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <version>1.0.1</version>
+ <type>jar</type>
+ </dependency>
+ <dependency start="false">
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-common</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ <type>jar</type>
+ </dependency>
+ <dependency start="false">
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>0.9.94</version>
+ <type>jar</type>
+ </dependency>
+ <dependency start="false">
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-crypto</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ <type>jar</type>
+ </dependency>
+ <dependency start="false">
+ <groupId>ognl</groupId>
+ <artifactId>ognl</artifactId>
+ <version>2.6.9</version>
+ <type>jar</type>
+ </dependency>
+ <dependency start="false">
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>3.1</version>
+ <type>jar</type>
+ </dependency>
+ <dependency start="false">
+ <groupId>commons-jexl</groupId>
+ <artifactId>commons-jexl</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ </dependency>
+ <dependency start="false">
+ <groupId>asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>3.1</version>
+ <type>jar</type>
+ </dependency>
+ <dependency start="false">
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.0</version>
+ <type>jar</type>
+ </dependency>
+ <dependency start="false">
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>3.2.1</version>
+ <type>jar</type>
+ </dependency>
+ <dependency start="false">
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+ <version>1.0</version>
+ <type>jar</type>
+ </dependency>
+ <dependency start="false">
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.0.2</version>
+ <type>jar</type>
+ </dependency>
+ <dependency start="false">
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-system</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ <type>jar</type>
+ </dependency>
+ </plugin-artifact>
+</geronimo-plugin>
Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml (added)
+++ geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml Tue Apr 26 23:18:49 2011
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.-->
+<!--Configuration for the innermost ring of a Geronimo server.
+This module should only contain critical services needed to
+run other Configurations - for example, the ServerInfo, Logging
+and Repository services used to load them.
+
+This module should *NOT* be used to provide server or application
+specific services - those should be provided by children.-->
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+ <environment>
+ <moduleId>
+ <groupId>org.apache.geronimo.buildsupport.it</groupId>
+ <artifactId>j2ee-system</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ <type>car</type>
+ </moduleId>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.1.7</version>
+ <type>jar</type>
+ <import>classes</import>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <version>1.0.1</version>
+ <type>jar</type>
+ <import>classes</import>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-common</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ <type>jar</type>
+ <import>classes</import>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>0.9.91</version>
+ <type>jar</type>
+ <import>classes</import>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-crypto</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ <type>jar</type>
+ <import>classes</import>
+ </dependency>
+ <dependency>
+ <groupId>ognl</groupId>
+ <artifactId>ognl</artifactId>
+ <version>2.6.9</version>
+ <type>jar</type>
+ <import>classes</import>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>3.1</version>
+ <type>jar</type>
+ <import>classes</import>
+ </dependency>
+ <dependency>
+ <groupId>commons-jexl</groupId>
+ <artifactId>commons-jexl</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <import>classes</import>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>3.1</version>
+ <type>jar</type>
+ <import>classes</import>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.0</version>
+ <type>jar</type>
+ <import>classes</import>
+ </dependency>
+ <dependency>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>3.2.1</version>
+ <type>jar</type>
+ <import>classes</import>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+ <version>1.0</version>
+ <type>jar</type>
+ <import>classes</import>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.0.2</version>
+ <type>jar</type>
+ <import>classes</import>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-system</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ <type>jar</type>
+ <import>classes</import>
+ </dependency>
+ </dependencies>
+ <hidden-classes/>
+ <non-overridable-classes/>
+ </environment>
+ <gbean name="EmbeddedDaemon" class="org.apache.geronimo.system.main.EmbeddedDaemon"/>
+ <!--ServerInfo service-->
+ <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
+ <!--Repository-->
+ <gbean name="Repository" class="org.apache.geronimo.system.repository.Maven2Repository">
+ <attribute name="root">repository/</attribute>
+ <reference name="ServerInfo">
+ <name>ServerInfo</name>
+ </reference>
+ </gbean>
+ <!--Pinged and changed when the server completes loading when all the persistent configuration is loaded-->
+ <gbean name="ServerStatus" class="org.apache.geronimo.system.main.ServerStatusGBean">
+ <attribute name="serverStarted">false</attribute>
+ </gbean>
+ <!--Configuration Store service-->
+ <gbean name="Local" class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore">
+ <reference name="Repository">
+ <name>Repository</name>
+ </reference>
+ </gbean>
+ <!--User-editable attribute service-->
+ <gbean name="AttributeManager" class="org.apache.geronimo.system.configuration.LocalAttributeManager">
+ <reference name="ServerInfo">
+ <name>ServerInfo</name>
+ </reference>
+ <attribute name="configFile">var/config/config.xml</attribute>
+ <attribute name="substitutionsFile">var/config/config-substitutions.properties</attribute>
+ <attribute name="substitutionPrefix">org.apache.geronimo.config.substitution.</attribute>
+ </gbean>
+ <!--ArtifactManager-->
+ <gbean name="ArtifactManager" class="org.apache.geronimo.kernel.repository.DefaultArtifactManager"/>
+ <!--ArtifactResolver-->
+ <gbean name="ArtifactResolver" class="org.apache.geronimo.system.resolver.ExplicitDefaultArtifactResolver">
+ <reference name="ArtifactManager">
+ <name>ArtifactManager</name>
+ </reference>
+ <reference name="Repositories"/>
+ <attribute name="versionMapLocation">var/config/artifact_aliases.properties</attribute>
+ <reference name="ServerInfo">
+ <name>ServerInfo</name>
+ </reference>
+ </gbean>
+ <!--Configuration Manager service-->
+ <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.EditableKernelConfigurationManager">
+ <reference name="Repositories"/>
+ <reference name="Stores"/>
+ <reference name="Watchers"/>
+ <reference name="AttributeStore">
+ <name>AttributeManager</name>
+ </reference>
+ <reference name="PersistentConfigurationList">
+ <type>AttributeStore</type>
+ <name>AttributeManager</name>
+ </reference>
+ <reference name="ArtifactManager">
+ <name>ArtifactManager</name>
+ </reference>
+ <reference name="ArtifactResolver">
+ <name>ArtifactResolver</name>
+ </reference>
+ </gbean>
+ <!--Logging service-->
+ <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
+ <attribute name="configFileName">var/log/server-log4j.properties</attribute>
+ <attribute name="refreshPeriodSeconds">60</attribute>
+ <reference name="ServerInfo">
+ <name>ServerInfo</name>
+ </reference>
+ </gbean>
+</module>
Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/validate.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/validate.groovy?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/validate.groovy (added)
+++ geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it1/validate.groovy Tue Apr 26 23:18:49 2011
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Loads text from a file an normalizes its EOL-style for platform-safe validation.
+ */
+def loadText = { filename ->
+ def file = new File(basedir, "$filename")
+
+ def tmp = File.createTempFile('validate', null, basedir)
+ tmp.deleteOnExit()
+
+ ant.copy(file: file, tofile: tmp)
+ ant.fixcrlf(eol: 'unix', file: tmp)
+
+ def text = tmp.text
+ tmp.delete()
+
+ return text
+}
+
+/**
+ * Asserts that the text of both files are the same in a platform-safe fasion.
+ */
+def assertSame = { file1, file2 ->
+ def expect = loadText(file1)
+ def found = loadText(file2)
+
+ assert expect == found
+}
+
+assertSame('src/test/resources/META-INF/geronimo-plugin.xml', 'target/resources/META-INF/geronimo-plugin.xml')
+
+assertSame('src/test/resources/META-INF/plan.xml', 'target/work/plan.xml')
Added: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/goals.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/goals.txt?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/goals.txt (added)
+++ geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/goals.txt Tue Apr 26 23:18:49 2011
@@ -0,0 +1 @@
+org.apache.geronimo.buildsupport:car-maven-plugin:validate-configuration org.apache.geronimo.buildsupport:car-maven-plugin:prepare-plan org.apache.geronimo.buildsupport:car-maven-plugin:package org.apache.geronimo.buildsupport:car-maven-plugin:prepare-metadata
Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/goals.txt
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/goals.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml (from r1096950, geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml?p2=geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml&p1=geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml (original)
+++ geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml Tue Apr 26 23:18:49 2011
@@ -31,7 +31,7 @@
<groupId>org.apache.geronimo.buildsupport.it</groupId>
<artifactId>j2ee-system-it2</artifactId>
<name>Geronimo Configs :: J2EE System IT2</name>
- <packaging>car</packaging>
+ <packaging>feature</packaging>
<dependencies>
<dependency>
Copied: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/plan/plan.xml (from r1096950, geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/plan/plan.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/plan/plan.xml?p2=geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/plan/plan.xml&p1=geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/plan/plan.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/plan/plan.xml Tue Apr 26 23:18:49 2011
@@ -16,10 +16,20 @@
limitations under the License.
-->
-<!-- $Rev$ $Date$ -->
+<!--
+Configuration for the innermost ring of a Geronimo server.
+This module should only contain critical services needed to
+run other Configurations - for example, the ServerInfo, Logging
+and Repository services used to load them.
+
+This module should *NOT* be used to provide server or application
+specific services - those should be provided by children.
+-->
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+ <gbean name="EmbeddedDaemon" class="org.apache.geronimo.system.main.EmbeddedDaemon"/>
+
<!-- ServerInfo service -->
<gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
@@ -31,6 +41,11 @@
</reference>
</gbean>
+ <!-- Pinged and changed when the server completes loading when all the persistent configuration is loaded -->
+ <gbean name="ServerStatus" class="org.apache.geronimo.system.main.ServerStatusGBean">
+ <attribute name="serverStarted">false</attribute>
+ </gbean>
+
<!--Configuration Store service-->
<gbean name="Local" class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore">
<reference name="Repository">
@@ -43,8 +58,7 @@
<reference name="ServerInfo">
<name>ServerInfo</name>
</reference>
- <attribute name="readOnly">true</attribute>
- <attribute name="configFile">var/config/jsr88-configurer-config.xml</attribute>
+ <attribute name="configFile">var/config/config.xml</attribute>
<attribute name="substitutionsFile">var/config/config-substitutions.properties</attribute>
<attribute name="substitutionPrefix">org.apache.geronimo.config.substitution.</attribute>
</gbean>
@@ -65,7 +79,7 @@
</gbean>
<!--Configuration Manager service-->
- <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.KernelConfigurationManager">
+ <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.EditableKernelConfigurationManager">
<reference name="Repositories"></reference>
<reference name="Stores"></reference>
<reference name="Watchers"></reference>
@@ -84,15 +98,5 @@
</reference>
</gbean>
- <!-- Logging service -->
- <!--
- <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
- <attribute name="configFileName">var/log/deployer-log4j.properties</attribute>
- <attribute name="refreshPeriodSeconds">60</attribute>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
- </gbean>
- -->
</module>
Added: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/resources/META-INF/startup-jar
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/resources/META-INF/startup-jar?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/resources/META-INF/startup-jar (added)
+++ geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/main/resources/META-INF/startup-jar Tue Apr 26 23:18:49 2011
@@ -0,0 +1,18 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+This file tells the Geronimo bootstrap where to look for its installation
+directory, which is ../ from wherever the jar containing this file lives.
\ No newline at end of file
Added: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/geronimo-plugin.xml?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/geronimo-plugin.xml (added)
+++ geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/geronimo-plugin.xml Tue Apr 26 23:18:49 2011
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3"
+ xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+ <name>Geronimo Configs :: J2EE System</name>
+ <category>Geronimo Core</category>
+ <description>Apache Geronimo, the JavaEE server project of the Apache Software Foundation.</description>
+ <url>http://geronimo.apache.org/</url>
+ <author>The Apache Geronimo development community</author>
+ <license osi-approved="true">The Apache Software License, Version 2.0</license>
+ <plugin-artifact>
+ <module-id>
+ <groupId>org.apache.geronimo.buildsupport.it</groupId>
+ <artifactId>j2ee-system</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ <type>car</type>
+ </module-id>
+ <dependency start="true">
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-common</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency start="true">
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-system</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency start="true">
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-crypto</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency start="true">
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency start="true">
+ <groupId>asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency start="true">
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency start="true">
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency start="true">
+ <groupId>commons-jexl</groupId>
+ <artifactId>commons-jexl</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency start="true">
+ <groupId>ognl</groupId>
+ <artifactId>ognl</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency start="true">
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency start="true">
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency start="true">
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency start="true">
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency start="true">
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ </plugin-artifact>
+</geronimo-plugin>
Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/plan.xml?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/plan.xml (added)
+++ geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/plan.xml Tue Apr 26 23:18:49 2011
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.-->
+<!--Configuration for the innermost ring of a Geronimo server.
+This module should only contain critical services needed to
+run other Configurations - for example, the ServerInfo, Logging
+and Repository services used to load them.
+
+This module should *NOT* be used to provide server or application
+specific services - those should be provided by children.-->
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+ <environment>
+ <moduleId>
+ <groupId>org.apache.geronimo.buildsupport.it</groupId>
+ <artifactId>j2ee-system</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ <type>car</type>
+ </moduleId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-common</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-system</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-crypto</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>commons-jexl</groupId>
+ <artifactId>commons-jexl</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>ognl</groupId>
+ <artifactId>ognl</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ <hidden-classes/>
+ <non-overridable-classes/>
+ </environment>
+ <gbean name="EmbeddedDaemon" class="org.apache.geronimo.system.main.EmbeddedDaemon"/>
+ <!--ServerInfo service-->
+ <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
+ <!--Repository-->
+ <gbean name="Repository" class="org.apache.geronimo.system.repository.Maven2Repository">
+ <attribute name="root">repository/</attribute>
+ <reference name="ServerInfo">
+ <name>ServerInfo</name>
+ </reference>
+ </gbean>
+ <!--Pinged and changed when the server completes loading when all the persistent configuration is loaded-->
+ <gbean name="ServerStatus" class="org.apache.geronimo.system.main.ServerStatusGBean">
+ <attribute name="serverStarted">false</attribute>
+ </gbean>
+ <!--Configuration Store service-->
+ <gbean name="Local" class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore">
+ <reference name="Repository">
+ <name>Repository</name>
+ </reference>
+ </gbean>
+ <!--User-editable attribute service-->
+ <gbean name="AttributeManager" class="org.apache.geronimo.system.configuration.LocalAttributeManager">
+ <reference name="ServerInfo">
+ <name>ServerInfo</name>
+ </reference>
+ <attribute name="configFile">var/config/config.xml</attribute>
+ <attribute name="substitutionsFile">var/config/config-substitutions.properties</attribute>
+ <attribute name="substitutionPrefix">org.apache.geronimo.config.substitution.</attribute>
+ </gbean>
+ <!--ArtifactManager-->
+ <gbean name="ArtifactManager" class="org.apache.geronimo.kernel.repository.DefaultArtifactManager"/>
+ <!--ArtifactResolver-->
+ <gbean name="ArtifactResolver" class="org.apache.geronimo.system.resolver.ExplicitDefaultArtifactResolver">
+ <reference name="ArtifactManager">
+ <name>ArtifactManager</name>
+ </reference>
+ <reference name="Repositories"/>
+ <attribute name="versionMapLocation">var/config/artifact_aliases.properties</attribute>
+ <reference name="ServerInfo">
+ <name>ServerInfo</name>
+ </reference>
+ </gbean>
+ <!--Configuration Manager service-->
+ <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.EditableKernelConfigurationManager">
+ <reference name="Repositories"/>
+ <reference name="Stores"/>
+ <reference name="Watchers"/>
+ <reference name="AttributeStore">
+ <name>AttributeManager</name>
+ </reference>
+ <reference name="PersistentConfigurationList">
+ <type>AttributeStore</type>
+ <name>AttributeManager</name>
+ </reference>
+ <reference name="ArtifactManager">
+ <name>ArtifactManager</name>
+ </reference>
+ <reference name="ArtifactResolver">
+ <name>ArtifactResolver</name>
+ </reference>
+ </gbean>
+ <!--Logging service-->
+ <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
+ <attribute name="configFileName">var/log/server-log4j.properties</attribute>
+ <attribute name="refreshPeriodSeconds">60</attribute>
+ <reference name="ServerInfo">
+ <name>ServerInfo</name>
+ </reference>
+ </gbean>
+</module>
Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/plan.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/plan.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/plan.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/validate.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/validate.groovy?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/validate.groovy (added)
+++ geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/j2ee-system-it2/validate.groovy Tue Apr 26 23:18:49 2011
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Loads text from a file an normalizes its EOL-style for platform-safe validation.
+ */
+def loadText = { filename ->
+ def file = new File(basedir, "$filename")
+
+ def tmp = File.createTempFile('validate', null, basedir)
+ tmp.deleteOnExit()
+
+ ant.copy(file: file, tofile: tmp)
+ ant.fixcrlf(eol: 'unix', file: tmp)
+
+ def text = tmp.text
+ tmp.delete()
+
+ return text
+}
+
+/**
+ * Asserts that the text of both files are the same in a platform-safe fasion.
+ */
+def assertSame = { file1, file2 ->
+ def expect = loadText(file1)
+ def found = loadText(file2)
+
+ assert expect == found
+}
+
+assertSame('src/test/resources/META-INF/geronimo-plugin.xml', 'target/resources/META-INF/geronimo-plugin.xml')
+
+assertSame('src/test/resources/META-INF/plan.xml', 'target/work/plan.xml')
Added: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/goals.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/goals.txt?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/goals.txt (added)
+++ geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/goals.txt Tue Apr 26 23:18:49 2011
@@ -0,0 +1 @@
+org.apache.geronimo.buildsupport:car-maven-plugin:prepare-metadata
Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/goals.txt
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/goals.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/pom.xml (from r1096950, geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/pom.xml?p2=geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/pom.xml&p1=geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml&r1=1096950&r2=1096951&rev=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml (original)
+++ geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/pom.xml Tue Apr 26 23:18:49 2011
@@ -31,19 +31,47 @@
</parent>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
- <artifactId>metadatatest-it4</artifactId>
- <name>Metadata test it4</name>
- <packaging>car</packaging>
+ <artifactId>metadatageneration-it3</artifactId>
+ <name>Metadata generation test it3</name>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
+ <artifactId>geronimo-system</artifactId>
<version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-deploy-tool</artifactId>
+ <version>${project.version}</version>
+
+ <!-- exclude transitive deps -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-crypto</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-deploy-jsr88</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-archiver</artifactId>
+ <version>2.2</version>
+ </dependency>
+
<dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
@@ -51,6 +79,11 @@
</dependency>
<dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
</dependency>
@@ -58,7 +91,6 @@
<dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3_min</artifactId>
- <scope>test</scope>
</dependency>
</dependencies>
@@ -70,10 +102,27 @@
<configuration>
<category>Test</category>
<osiApproved>true</osiApproved>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
+ <dependencies>
+ <dependency>
+ <groupId>xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.4</version>
+ <type>jar</type>
+ <start>true</start>
+ <import>classes</import>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
+ <version>${project.version}</version>
+ <start>false</start>
+ </dependency>
+ </dependencies>
<instance>
<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
<jvm-version>1.5</jvm-version>
@@ -96,6 +145,12 @@
<attribute name="userRepositories">~/.m2/repository,#{key1}</attribute>
</gbean>
</config-xml-content>
+ <config-xml-content condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2'" server="bar">
+ <gbean name="DownloadedPluginRepos">
+ <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-3.0.txt</attribute>
+ <attribute name="userRepositories">~/.m2/repository,#{key1}</attribute>
+ </gbean>
+ </config-xml-content>
<source-repository>http://foo.com</source-repository>
<source-repository>http://bar.com</source-repository>
<copy-file relative-to="WEB-INF" dest-dir="bar">META-INF/foo.xml</copy-file>
Added: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml (added)
+++ geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml Tue Apr 26 23:18:49 2011
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+ <name>Geronimo Maven2 Plugins :: CAR</name>
+ <category>Test</category>
+ <description>Apache Geronimo, the JavaEE server project of the Apache Software Foundation.</description>
+ <url>http://geronimo.apache.org/</url>
+ <author>The Apache Geronimo development community</author>
+ <license osi-approved="true">The Apache Software License, Version 2.0</license>
+ <plugin-artifact>
+ <module-id>
+ <groupId>org.apache.geronimo.buildsupport.it</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ <type>jar</type>
+ </module-id>
+ <jvm-version>1.5</jvm-version>
+ <jvm-version>1.5.2</jvm-version>
+ <prerequisite>
+ <id>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </id>
+ <resource-type>joke</resource-type>
+ <description>this is an explanation</description>
+ </prerequisite>
+ <dependency>
+ <groupId>xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency start="true">
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.4</version>
+ <type>jar</type>
+ </dependency>
+ <dependency start="false">
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <obsoletes>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </obsoletes>
+ <source-repository>http://foo.com</source-repository>
+ <source-repository>http://bar.com</source-repository>
+ <copy-file relative-to="WEB-INF" dest-dir="bar">META-INF/foo.xml</copy-file>
+ <config-xml-content>
+ <ns2:gbean name="DownloadedPluginRepos">
+ <ns2:attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.1.txt</ns2:attribute>
+ <ns2:attribute name="userRepositories">~/.m2/repository,${key1}</ns2:attribute>
+ </ns2:gbean>
+ </config-xml-content>
+ <config-xml-content condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2'" server="bar">
+ <ns2:gbean name="DownloadedPluginRepos">
+ <ns2:attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.1.txt</ns2:attribute>
+ <ns2:attribute name="userRepositories">~/.m2/repository,${key1}</ns2:attribute>
+ </ns2:gbean>
+ </config-xml-content>
+ <artifact-alias key="org.apache.geronimo.test/foo//car">org.apache.geronimo.test/bar/1.0/car</artifact-alias>
+ <config-substitution key="key2">value2</config-substitution>
+ <config-substitution key="key1">value1</config-substitution>
+ </plugin-artifact>
+</geronimo-plugin>
Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/validate.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/validate.groovy?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/validate.groovy (added)
+++ geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it3/validate.groovy Tue Apr 26 23:18:49 2011
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Loads text from a file an normalizes its EOL-style for platform-safe validation.
+ */
+def loadText = { filename ->
+ def file = new File(basedir, "$filename")
+
+ def tmp = File.createTempFile('validate', null, basedir)
+ tmp.deleteOnExit()
+
+ ant.copy(file: file, tofile: tmp)
+ ant.fixcrlf(eol: 'unix', file: tmp)
+
+ def text = tmp.text
+ tmp.delete()
+
+ return text
+}
+
+/**
+ * Asserts that the text of both files are the same in a platform-safe fasion.
+ */
+def assertSame = { file1, file2 ->
+ def expect = loadText(file1)
+ def found = loadText(file2)
+
+ assert expect == found
+}
+
+assertSame('src/test/resources/META-INF/geronimo-plugin.xml', 'target/resources/META-INF/geronimo-plugin.xml')
Added: geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/goals.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/goals.txt?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/goals.txt (added)
+++ geronimo/server/trunk/framework/features/geronimo-gbean-deployer/src/it/metadatageneration-it4/goals.txt Tue Apr 26 23:18:49 2011
@@ -0,0 +1 @@
+org.apache.geronimo.buildsupport:car-maven-plugin:prepare-plan org.apache.geronimo.buildsupport:car-maven-plugin:package org.apache.geronimo.buildsupport:car-maven-plugin:prepare-metadata