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 [2/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/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java Tue Apr 26 23:18:49 2011
@@ -118,25 +118,35 @@ public class PlanProcessorMojo
environmentType.setModuleId(artifactType);
-
- if (targetDir.exists()) {
- if (!targetDir.isDirectory()) {
- throw new RuntimeException("TargetDir: " + this.targetDir + " exists and is not a directory");
- }
- } else {
- targetDir.mkdirs();
+ if (targetDir.exists()) {
+ if (!targetDir.isDirectory()) {
+ throw new RuntimeException("TargetDir: " + this.targetDir + " exists and is not a directory");
}
+ } else {
+ targetDir.mkdirs();
+ }
- Writer out = new FileWriter(targetFile);
+ Writer out = new FileWriter(targetFile);
try {
- JaxbUtil.marshal(ModuleType.class, moduleType, out);
+ JaxbUtil.marshalModule(moduleType, out);
} finally {
out.close();
}
if (getLog() != null) {
- getLog().info("Generated: " + targetFile);
- }
+ getLog().info("Generated: " + targetFile);
+ }
+ //TODO temporary test
+ in = new FileInputStream(targetFile);
+ ModuleType m2;
+ try {
+ m2 = JaxbUtil.unmarshalModule(in, false);
+ } finally {
+ in.close();
+ }
+ if (m2.getEnvironment() == null || moduleType.getGbean().size() != m2.getGbean().size()) {
+ throw new IllegalStateException("m2 missing environment or gbeans " + m2.getEnvironment() + " gbean count: " + m2.getGbean().size());
+ }
} catch (Exception e) {
throw new MojoExecutionException("Could not process plan", e);
}
Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml Tue Apr 26 23:18:49 2011
@@ -48,7 +48,7 @@
org.apache.geronimo.buildsupport:car-maven-plugin:prepare-plan
</compile>
<package>
- org.apache.geronimo.buildsupport:car-maven-plugin:karaf-framework,
+ org.apache.geronimo.buildsupport:car-maven-plugin:compile-gbean-plan,
org.apache.geronimo.buildsupport:car-maven-plugin:archive-car
</package>
<install>
Modified: geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile (original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile Tue Apr 26 23:18:49 2011
@@ -143,7 +143,7 @@ org.osgi.framework.system.packages.extra
sun.reflect, \
org.apache.geronimo.main, \
org.apache.geronimo.transformer, \
- org.apache.karaf.jaas.boot;version=2.2.1.SNAPSHOT
+ org.apache.karaf.jaas.boot;version=2.1.2
org.osgi.framework.bootdelegation = \
javax.*,\
Modified: geronimo/server/trunk/framework/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/client-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/client-system/pom.xml Tue Apr 26 23:18:49 2011
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>configs</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -33,13 +33,6 @@
<packaging>car</packaging>
<dependencies>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
@@ -128,11 +121,7 @@
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>car-maven-plugin</artifactId>
<configuration>
- <deploymentConfigs>
- <deploymentConfig>${gbeanDeployerBootstrap}</deploymentConfig>
- </deploymentConfigs>
- <deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
- <boot>true</boot>
+ <!--<boot>true</boot>-->
<!--
<archive>
<manifestEntries>
Modified: geronimo/server/trunk/framework/configs/client-system/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/src/main/plan/plan.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/client-system/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/client-system/src/main/plan/plan.xml Tue Apr 26 23:18:49 2011
@@ -19,28 +19,28 @@
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<!-- ServerInfo service -->
- <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
+ <!--<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>
+ <!--<gbean name="Repository" class="org.apache.geronimo.system.repository.Maven2Repository">-->
+ <!--<attribute name="root">repository/</attribute>-->
+ <!--<reference name="ServerInfo">-->
+ <!--<name>ServerInfo</name>-->
+ <!--</reference>-->
+ <!--</gbean>-->
<!--Configuration Store service-->
- <gbean name="Local" class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore">
- <reference name="Repository">
- <name>Repository</name>
- </reference>
- </gbean>
+ <!--<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>
+ <!--<reference name="ServerInfo">-->
+ <!--<name>ServerInfo</name>-->
+ <!--</reference>-->
<attribute name="readOnly">true</attribute>
<attribute name="configFile">var/config/config.xml</attribute>
<attribute name="substitutionsFile">var/config/config-substitutions.properties</attribute>
@@ -48,56 +48,56 @@
</gbean>
<!-- ArtifactManager -->
- <gbean name="ArtifactManager" class="org.apache.geronimo.kernel.repository.DefaultArtifactManager"/>
+ <!--<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"></reference>
- <attribute name="versionMapLocation">var/config/client_artifact_aliases.properties</attribute>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
- </gbean>
+ <!--<gbean name="ArtifactResolver" class="org.apache.geronimo.system.resolver.ExplicitDefaultArtifactResolver">-->
+ <!--<reference name="ArtifactManager">-->
+ <!--<name>ArtifactManager</name>-->
+ <!--</reference>-->
+ <!--<reference name="Repositories"></reference>-->
+ <!--<attribute name="versionMapLocation">var/config/client_artifact_aliases.properties</attribute>-->
+ <!--<reference name="ServerInfo">-->
+ <!--<name>ServerInfo</name>-->
+ <!--</reference>-->
+ <!--</gbean>-->
<!--Configuration Manager service-->
- <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.KernelConfigurationManager">
- <reference name="Repositories">
- </reference>
- <reference name="Stores">
- </reference>
- <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>
-
- <gbean name="ConfigurationExtender" class="org.apache.geronimo.system.configuration.ConfigurationExtender">
- <reference name="ConfigurationManager">
- <name>ConfigurationManager</name>
- </reference>
- <reference name="DependencyManager">
- <name>DependencyManager</name>
- </reference>
- </gbean>
+ <!--<gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.KernelConfigurationManager">-->
+ <!--<reference name="Repositories">-->
+ <!--</reference>-->
+ <!--<reference name="Stores">-->
+ <!--</reference>-->
+ <!--<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>-->
+
+ <!--<gbean name="ConfigurationExtender" class="org.apache.geronimo.system.configuration.ConfigurationExtender">-->
+ <!--<reference name="ConfigurationManager">-->
+ <!--<name>ConfigurationManager</name>-->
+ <!--</reference>-->
+ <!--<reference name="DependencyManager">-->
+ <!--<name>DependencyManager</name>-->
+ <!--</reference>-->
+ <!--</gbean>-->
- <gbean name="DependencyManager" class="org.apache.geronimo.system.configuration.DependencyManager">
- <reference name="Repositories"></reference>
- <reference name="ArtifactResolver">
- <name>ArtifactResolver</name>
- </reference>
- </gbean>
+ <!--<gbean name="DependencyManager" class="org.apache.geronimo.system.configuration.DependencyManager">-->
+ <!--<reference name="Repositories"></reference>-->
+ <!--<reference name="ArtifactResolver">-->
+ <!--<name>ArtifactResolver</name>-->
+ <!--</reference>-->
+ <!--</gbean>-->
<!-- Logging service -->
<!--
@@ -110,6 +110,6 @@
</gbean>
-->
- <gbean name="EmbeddedClientCommandLine" class="org.apache.geronimo.system.main.EmbeddedClientCommandLine"/>
+ <!--<gbean name="EmbeddedClientCommandLine" class="org.apache.geronimo.system.main.EmbeddedClientCommandLine"/>-->
</module>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml Tue Apr 26 23:18:49 2011
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>configs</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -55,19 +55,12 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>plugin</artifactId>
<version>${project.version}</version>
<type>car</type>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
@@ -99,15 +92,11 @@
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>car-maven-plugin</artifactId>
<configuration>
- <deploymentConfigs>
- <deploymentConfig>${gbeanDeployerBootstrap}</deploymentConfig>
- </deploymentConfigs>
- <deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
<category>Geronimo Core</category>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>plugin</artifactId>
<version>${project.version}</version>
<type>car</type>
Modified: 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/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml Tue Apr 26 23:18:49 2011
@@ -157,7 +157,7 @@
<!-- build order hint -->
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
<version>${project.version}</version>
<type>car</type>
Modified: 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/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml Tue Apr 26 23:18:49 2011
@@ -157,7 +157,7 @@
<!-- build order hint -->
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
<version>${project.version}</version>
<type>car</type>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/pom.xml Tue Apr 26 23:18:49 2011
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>geronimo-gbean-deployer</artifactId>
<version>${project.version}</version>
<type>car</type>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/plan/plan.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/plan/plan.xml Tue Apr 26 23:18:49 2011
@@ -15,18 +15,18 @@
limitations under the License.-->
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <gbean name="Deployer" class="org.apache.geronimo.deployment.DeployerImpl">
- <attribute name="remoteDeployAddress">localhost:8080</attribute>
- <reference name="Store">
- </reference>
- <reference name="Builders"></reference>
- <reference name="Watchers"></reference>
- </gbean>
+ <!--<gbean name="Deployer" class="org.apache.geronimo.deployment.DeployerImpl">-->
+ <!--<attribute name="remoteDeployAddress">localhost:8080</attribute>-->
+ <!--<!–<reference name="Store">–>-->
+ <!--<!–</reference>–>-->
+ <!--<reference name="Builders"></reference>-->
+ <!--<reference name="Watchers"></reference>-->
+ <!--</gbean>-->
<!--Builder for handling plans defining Geronimo modules-->
<gbean name="ServiceBuilder" class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
- <reference name="Repository">
- </reference>
+ <!--<reference name="Repository">-->
+ <!--</reference>-->
<reference name="ServiceBuilders">
<name>GBeanBuilder</name>
</reference>
@@ -40,7 +40,7 @@
</reference>
</gbean>
- <gbean name="JavaBeanXmlAttributeBuilder" class="org.apache.geronimo.deployment.service.JavaBeanXmlAttributeBuilder"/>
+ <!--<gbean name="JavaBeanXmlAttributeBuilder" class="org.apache.geronimo.deployment.service.JavaBeanXmlAttributeBuilder"/>-->
<!-- environment builder is installed in code because it is needed to deploy this module. -->
<!--<gbean name="EnvironmentBuilder" class="org.apache.geronimo.deployment.service.EnvironmentBuilder"/>-->
Modified: geronimo/server/trunk/framework/configs/j2ee-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-security/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-security/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-security/pom.xml Tue Apr 26 23:18:49 2011
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>configs</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -36,17 +36,10 @@
<description>Basic Geronimo server security infrastructure</description>
<dependencies>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
<!-- parent -->
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>rmi-naming</artifactId>
<version>${project.version}</version>
<type>car</type>
@@ -68,6 +61,38 @@
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-jaspi</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>sxc-jaxb</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>sxc-runtime</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-management</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaspic_1.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jacc_1.4_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </dependency>
+
<!--
<dependency>
<groupId>org.soter.rbac</groupId>
Modified: geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml Tue Apr 26 23:18:49 2011
@@ -36,9 +36,4 @@
<artifactId>geronimo-jaspic_1.0_spec</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>org.apache.karaf.jaas</groupId>
- <artifactId>org.apache.karaf.jaas.boot</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/pom.xml Tue Apr 26 23:18:49 2011
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>configs</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -155,15 +155,6 @@
<artifactId>org.apache.felix.configadmin</artifactId>
</dependency>
-
- <!-- build order hint -->
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
@@ -173,12 +164,7 @@
<artifactId>car-maven-plugin</artifactId>
<configuration>
- <deploymentConfigs>
- <deploymentConfig>${gbeanDeployerBootstrap}</deploymentConfig>
- </deploymentConfigs>
- <deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
- <boot>true</boot>
-
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: geronimo/server/trunk/framework/configs/j2ee-system/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/src/main/plan/plan.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/src/main/plan/plan.xml Tue Apr 26 23:18:49 2011
@@ -29,17 +29,17 @@ specific services - those should be prov
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<!-- ServerInfo service -->
- <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo">
- <attribute name="useSystemProperties">true</attribute>
- </gbean>
+ <!--<gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo">-->
+ <!--<attribute name="useSystemProperties">true</attribute>-->
+ <!--</gbean>-->
<!--Repository-->
- <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="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">
@@ -49,64 +49,64 @@ specific services - those should be prov
<!--<gbean name="ConfigurationDataTransformer" class="org.apache.geronimo.kernel.config.transformer.GroovyTransformer" />-->
<!--Configuration Store service-->
- <gbean name="Local" class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore">
- <reference name="Repository">
- <name>Repository</name>
- </reference>
- <!--<reference name="ConfigurationDataTransformer">-->
- <!--<name>ConfigurationDataTransformer</name>-->
+ <!--<gbean name="Local" class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore">-->
+ <!--<reference name="Repository">-->
+ <!--<name>Repository</name>-->
<!--</reference>-->
- </gbean>
+ <!--<!–<reference name="ConfigurationDataTransformer">–>-->
+ <!--<!–<name>ConfigurationDataTransformer</name>–>-->
+ <!--<!–</reference>–>-->
+ <!--</gbean>-->
<!--User-editable attribute service-->
<gbean name="AttributeManager" class="org.apache.geronimo.system.configuration.LocalAttributeManager">
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
+ <!--<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"/>
+ <!--<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"></reference>
- <attribute name="versionMapLocation">var/config/artifact_aliases.properties</attribute>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
- <reference name="ConfigurationManagers">
- <name>ConfigurationManager</name>
- </reference>
- </gbean>
+ <!--<gbean name="ArtifactResolver" class="org.apache.geronimo.system.resolver.ExplicitDefaultArtifactResolver">-->
+ <!--<reference name="ArtifactManager">-->
+ <!--<name>ArtifactManager</name>-->
+ <!--</reference>-->
+ <!--<reference name="Repositories"></reference>-->
+ <!--<attribute name="versionMapLocation">var/config/artifact_aliases.properties</attribute>-->
+ <!--<reference name="ServerInfo">-->
+ <!--<name>ServerInfo</name>-->
+ <!--</reference>-->
+ <!--<reference name="ConfigurationManagers">-->
+ <!--<name>ConfigurationManager</name>-->
+ <!--</reference>-->
+ <!--</gbean> -->
<!--Configuration Manager service-->
- <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.EditableKernelConfigurationManager">
- <!--<attribute name="defaultStoreNameQuery">?name=MasterConfigurationStore</attribute>-->
- <attribute name="defaultStoreNameQuery">?name=Local</attribute>
- <reference name="Repositories"></reference>
- <reference name="Stores"></reference>
- <reference name="Watchers"></reference>
- <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>
+ <!--<gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.EditableKernelConfigurationManager">-->
+ <!--<!–<attribute name="defaultStoreNameQuery">?name=MasterConfigurationStore</attribute>–>-->
+ <!--<attribute name="defaultStoreNameQuery">?name=Local</attribute>-->
+ <!--<reference name="Repositories"></reference>-->
+ <!--<reference name="Stores"></reference>-->
+ <!--<reference name="Watchers"></reference>-->
+ <!--<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>-->
<!--<gbean name="ConfigurationExtender" class="org.apache.geronimo.system.configuration.ConfigurationExtender">-->
<!--<reference name="ConfigurationManager">-->
@@ -124,22 +124,22 @@ specific services - those should be prov
<!--</reference>-->
<!--</gbean>-->
- <gbean name="Logger" class="org.apache.geronimo.system.logging.OSGILogServiceWrapper">
- </gbean>
+ <!--<gbean name="Logger" class="org.apache.geronimo.system.logging.OSGILogServiceWrapper"> -->
+ <!--</gbean> -->
<gbean name="GeronimoOBR" class="org.apache.geronimo.obr.GeronimoOBRGBean">
- <reference name="Repository">
- <name>Repository</name>
- </reference>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
+ <!--<reference name="Repository">-->
+ <!--<name>Repository</name>-->
+ <!--</reference>-->
+ <!--<reference name="ServerInfo">-->
+ <!--<name>ServerInfo</name>-->
+ <!--</reference>-->
<attribute name="exclusions">
org.apache.felix/org.apache.felix.framework//,
org.eclipse/osgi//
</attribute>
</gbean>
- <gbean name="EmbeddedDaemon" class="org.apache.geronimo.system.main.EmbeddedDaemon"/>
+ <!--<gbean name="EmbeddedDaemon" class="org.apache.geronimo.system.main.EmbeddedDaemon"/>-->
</module>
Modified: geronimo/server/trunk/framework/configs/jmx-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jmx-security/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jmx-security/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jmx-security/pom.xml Tue Apr 26 23:18:49 2011
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>configs</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -35,20 +35,52 @@
<description>Secure (SSL/TSL) JMX Connector.</description>
<dependencies>
+
+ <!-- parent -->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.framework.config</groupId>-->
+ <!--<artifactId>server-security-config</artifactId>-->
+ <!--<version>${project.version}</version>-->
+ <!--<type>car</type>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
+ <artifactId>geronimo-jmx-remoting</artifactId>
<version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
</dependency>
-
- <!-- parent -->
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>server-security-config</artifactId>
+ <artifactId>geronimo-management</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-security</artifactId>
<version>${project.version}</version>
- <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaspic_1.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jacc_1.4_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-jaspi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>sxc-jaxb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>sxc-runtime</artifactId>
</dependency>
</dependencies>
@@ -58,9 +90,6 @@
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>car-maven-plugin</artifactId>
<configuration>
- <deploymentConfigs>
- <deploymentConfig>${gbeanDeployer}</deploymentConfig>
- </deploymentConfigs>
<category>Security</category>
<instance>
<plugin-artifact>
Modified: geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml Tue Apr 26 23:18:49 2011
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>configs</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -34,13 +34,6 @@
<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>
@@ -71,6 +64,10 @@
<artifactId>geronimo-cli</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
@@ -83,6 +80,15 @@
<artifactId>geronimo-deploy-config</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-plugin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.ant</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -95,22 +101,22 @@
<!--</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-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>
Modified: geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-cli/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/jsr88-deploymentfactory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml Tue Apr 26 23:18:49 2011
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>configs</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -33,13 +33,6 @@
<packaging>car</packaging>
<dependencies>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
@@ -87,25 +80,25 @@
</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-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>
Modified: geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/plan/plan.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/plan/plan.xml Tue Apr 26 23:18:49 2011
@@ -21,28 +21,28 @@
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<!-- ServerInfo service -->
- <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
+ <!--<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>
+ <!--<gbean name="Repository" class="org.apache.geronimo.system.repository.Maven2Repository">-->
+ <!--<attribute name="root">repository/</attribute>-->
+ <!--<reference name="ServerInfo">-->
+ <!--<name>ServerInfo</name>-->
+ <!--</reference>-->
+ <!--</gbean>-->
<!--Configuration Store service-->
- <gbean name="Local" class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore">
- <reference name="Repository">
- <name>Repository</name>
- </reference>
- </gbean>
+ <!--<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>
+ <!--<reference name="ServerInfo">-->
+ <!--<name>ServerInfo</name>-->
+ <!--</reference>-->
<attribute name="readOnly">true</attribute>
<attribute name="configFile">var/config/jsr88-configurer-config.xml</attribute>
<attribute name="substitutionsFile">var/config/config-substitutions.properties</attribute>
@@ -50,39 +50,39 @@
</gbean>
<!-- ArtifactManager -->
- <gbean name="ArtifactManager" class="org.apache.geronimo.kernel.repository.DefaultArtifactManager"/>
+ <!--<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"></reference>
- <attribute name="versionMapLocation">var/config/artifact_aliases.properties</attribute>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
- </gbean>
+ <!--<gbean name="ArtifactResolver" class="org.apache.geronimo.system.resolver.ExplicitDefaultArtifactResolver">-->
+ <!--<reference name="ArtifactManager">-->
+ <!--<name>ArtifactManager</name>-->
+ <!--</reference>-->
+ <!--<reference name="Repositories"></reference>-->
+ <!--<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.KernelConfigurationManager">
- <reference name="Repositories"></reference>
- <reference name="Stores"></reference>
- <reference name="Watchers"></reference>
- <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>
+ <!--<gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.KernelConfigurationManager">-->
+ <!--<reference name="Repositories"></reference>-->
+ <!--<reference name="Stores"></reference>-->
+ <!--<reference name="Watchers"></reference>-->
+ <!--<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 -->
<!--
Added: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf?rev=1096951&view=auto
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf (added)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf Tue Apr 26 23:18:49 2011
@@ -0,0 +1,319 @@
+#!/bin/sh
+#
+# 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.
+#
+# $Id: karaf 979 2005-11-30 22:50:55Z bsnyder $
+#
+
+DIRNAME=`dirname $0`
+PROGNAME=`basename $0`
+
+#
+# Check/Set up some easily accessible MIN/MAX params for JVM mem usage
+#
+
+if [ "x$JAVA_MIN_MEM" = "x" ]; then
+ JAVA_MIN_MEM=1024M
+ export JAVA_MIN_MEM
+fi
+
+if [ "x$JAVA_MAX_MEM" = "x" ]; then
+ JAVA_MAX_MEM=2048M
+ export JAVA_MAX_MEM
+fi
+
+if [ "x$JAVA_MAX_PERM_SIZE" = "x" ]; then
+ JAVA_MAX_PERM_SIZE=512M
+ export JAVA_MAX_PERM_SIZE
+fi
+
+warn() {
+ echo "${PROGNAME}: $*"
+}
+
+die() {
+ warn "$*"
+ exit 1
+}
+
+maybeSource() {
+ file="$1"
+ if [ -f "$file" ] ; then
+ . $file
+ fi
+}
+
+detectOS() {
+ # OS specific support (must be 'true' or 'false').
+ cygwin=false;
+ darwin=false;
+ aix=false;
+ os400=false;
+ case "`uname`" in
+ CYGWIN*)
+ cygwin=true
+ ;;
+ Darwin*)
+ darwin=true
+ ;;
+ AIX*)
+ aix=true
+ ;;
+ OS400*)
+ os400=true
+ ;;
+ esac
+ # For AIX, set an environment variable
+ if $aix; then
+ export LDR_CNTRL=MAXDATA=0xB0000000@DSA
+ export IBM_JAVA_HEAPDUMP_TEXT=true
+ echo $LDR_CNTRL
+ fi
+}
+
+unlimitFD() {
+ # Use the maximum available, or set MAX_FD != -1 to use that
+ if [ "x$MAX_FD" = "x" ]; then
+ MAX_FD="maximum"
+ fi
+
+ # Increase the maximum file descriptors if we can
+ if [ "$os400" = "false" ] && [ "$cygwin" = "false" ]; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ "$MAX_FD_LIMIT" != 'unlimited' ]; then
+ if [ $? -eq 0 ]; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
+ # use the system max
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+
+ ulimit -n $MAX_FD > /dev/null
+ # echo "ulimit -n" `ulimit -n`
+ if [ $? -ne 0 ]; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+ fi
+ fi
+}
+
+locateHome() {
+ if [ "x$KARAF_HOME" != "x" ]; then
+ warn "Ignoring predefined value for KARAF_HOME"
+ fi
+
+ # In POSIX shells, CDPATH may cause cd to write to stdout
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+ KARAF_HOME=`cd $DIRNAME/..; pwd`
+ if [ ! -d "$KARAF_HOME" ]; then
+ die "KARAF_HOME is not valid: $KARAF_HOME"
+ fi
+}
+
+locateBase() {
+ if [ "x$KARAF_BASE" != "x" ]; then
+ if [ ! -d "$KARAF_BASE" ]; then
+ die "KARAF_BASE is not valid: $KARAF_BASE"
+ fi
+ else
+ KARAF_BASE=$KARAF_HOME
+ fi
+}
+
+setupNativePath() {
+ # Support for loading native libraries
+ LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$KARAF_BASE/lib:$KARAF_HOME/lib"
+
+ # For Cygwin, set PATH from LD_LIBRARY_PATH
+ if $cygwin; then
+ LD_LIBRARY_PATH=`cygpath --path --windows "$LD_LIBRARY_PATH"`
+ PATH="$PATH;$LD_LIBRARY_PATH"
+ export PATH
+ fi
+ export LD_LIBRARY_PATH
+}
+
+locateJava() {
+ # Setup the Java Virtual Machine
+ if $cygwin ; then
+ [ -n "$JAVA" ] && JAVA=`cygpath --unix "$JAVA"`
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ fi
+
+ if [ "x$JAVA" = "x" ]; then
+ if [ "x$JAVA_HOME" = "x" ] && [ "$darwin" = "true" ]; then
+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+ fi
+ if [ "x$JAVA_HOME" != "x" ]; then
+ if [ ! -d "$JAVA_HOME" ]; then
+ die "JAVA_HOME is not valid: $JAVA_HOME"
+ fi
+ JAVA="$JAVA_HOME/bin/java"
+ else
+ warn "JAVA_HOME not set; results may vary"
+ JAVA="java"
+ fi
+ fi
+}
+
+detectJVM() {
+ #echo "`$JAVA -version`"
+ # This service should call `java -version`,
+ # read stdout, and look for hints
+ if $JAVA -version 2>&1 | grep "^IBM" ; then
+ JVM_VENDOR="IBM"
+ # on OS/400, java -version does not contain IBM explicitly
+ elif $os400; then
+ JVM_VENDOR="IBM"
+ else
+ JVM_VENDOR="SUN"
+ fi
+ # echo "JVM vendor is $JVM_VENDOR"
+}
+
+setupDebugOptions() {
+ if [ "x$JAVA_OPTS" = "x" ]; then
+ JAVA_OPTS="$DEFAULT_JAVA_OPTS"
+ fi
+ export JAVA_OPTS
+
+ # Set Debug options if enabled
+ if [ "x$KARAF_DEBUG" != "x" ]; then
+ # Use the defaults if JAVA_DEBUG_OPTS was not set
+ if [ "x$JAVA_DEBUG_OPTS" = "x" ]; then
+ JAVA_DEBUG_OPTS="$DEFAULT_JAVA_DEBUG_OPTS"
+ fi
+
+ JAVA_OPTS="$JAVA_DEBUG_OPTS $JAVA_OPTS"
+ warn "Enabling Java debug options: $JAVA_DEBUG_OPTS"
+ fi
+}
+
+setupDefaults() {
+ DEFAULT_JAVA_OPTS="-Xms$JAVA_MIN_MEM -Xmx$JAVA_MAX_MEM -XX:MaxPermSize=$JAVA_MAX_PERM_SIZE "
+
+ #Set the JVM_VENDOR specific JVM flags
+ if [ "$JVM_VENDOR" = "SUN" ]; then
+ DEFAULT_JAVA_OPTS="-server $DEFAULT_JAVA_OPTS -Dcom.sun.management.jmxremote"
+ elif [ "$JVM_VENDOR" = "IBM" ]; then
+ if $os400; then
+ DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS"
+ elif $aix; then
+ DEFAULT_JAVA_OPTS="-Xverify:none -Xlp $DEFAULT_JAVA_OPTS"
+ else
+ DEFAULT_JAVA_OPTS="-Xverify:none $DEFAULT_JAVA_OPTS"
+ fi
+ fi
+
+ # Add the jars in the lib dir
+ for file in $KARAF_HOME/lib/*.jar
+ do
+ if [ -z "$CLASSPATH" ]; then
+ CLASSPATH="$file"
+ else
+ CLASSPATH="$CLASSPATH:$file"
+ fi
+ done
+
+ EXT_DIRS="$KARAF_HOME/lib/ext:$JAVA_HOME/lib/ext"
+ ENDORSED_DIRS="$KARAF_HOME/lib/endorsed:$JAVA_HOME/lib/endorsed"
+ JAVA_AGENT_JAR="$KARAF_HOME/lib/agent/transformer.jar"
+
+ DEFAULT_JAVA_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"
+
+ ##
+ ## TODO: Move to conf/profiler/yourkit.{sh|cmd}
+ ##
+ # Uncomment to enable YourKit profiling
+ #DEFAULT_JAVA_DEBUG_OPTS="-Xrunyjpagent"
+}
+
+init() {
+ # Determine if there is special OS handling we must perform
+ detectOS
+
+ # Unlimit the number of file descriptors if possible
+ unlimitFD
+
+ # Locate the Karaf home directory
+ locateHome
+
+ # Locate the Karaf base directory
+ locateBase
+
+ # Setup the native library path
+ setupNativePath
+
+ # Locate the Java VM to execute
+ locateJava
+
+ # Determine the JVM vendor
+ detectJVM
+
+ # Setup default options
+ setupDefaults
+
+ # Install debug options
+ setupDebugOptions
+
+}
+
+run() {
+ OPTS="-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=true"
+ case "$1" in
+ 'console')
+ shift
+ ;;
+ 'server')
+ OPTS="-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true"
+ shift
+ ;;
+ 'client')
+ OPTS="-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=false"
+ shift
+ ;;
+ esac
+
+ if $cygwin; then
+ KARAF_HOME=`cygpath --path --windows "$KARAF_HOME"`
+ KARAF_BASE=`cygpath --path --windows "$KARAF_BASE"`
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ EXT_DIRS=`cygpath --path --windows "$EXT_DIRS"`
+ ENDORSED_DIRS=`cygpath --path --windows "$ENDORSED_DIRS"`
+ fi
+ exec $JAVA $JAVA_OPTS \
+ -javaagent:"$JAVA_AGENT_JAR" \
+ -Dorg.apache.geronimo.home.dir="$KARAF_HOME" \
+ -Dkaraf.home="$KARAF_HOME" \
+ -Dkaraf.base="$KARAF_BASE" \
+ -Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties \
+ -Djava.endorsed.dirs="$ENDORSED_DIRS" \
+ -Djava.ext.dirs="$EXT_DIRS" \
+ $OPTS \
+ -classpath "$CLASSPATH" \
+ org.apache.geronimo.cli.daemon.DaemonCLI \
+ "$@"
+}
+
+main() {
+ init
+ run "$@"
+}
+
+main "$@"
Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf
------------------------------------------------------------------------------
svn:executable = *
Modified: geronimo/server/trunk/framework/configs/offline-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/offline-deployer/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/offline-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/offline-deployer/pom.xml Tue Apr 26 23:18:49 2011
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>configs</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -35,16 +35,9 @@
<description>Offline deployer</description>
<dependencies>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>online-deployer</artifactId>
<version>${project.version}</version>
<type>car</type>
Modified: geronimo/server/trunk/framework/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/online-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/online-deployer/pom.xml Tue Apr 26 23:18:49 2011
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>configs</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -35,13 +35,6 @@
<description>Geronimo Online Deployer</description>
<dependencies>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
@@ -83,25 +76,25 @@
<version>${project.version}</version>
</dependency>
- <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-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>
Modified: geronimo/server/trunk/framework/configs/online-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/src/main/plan/plan.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/online-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/online-deployer/src/main/plan/plan.xml Tue Apr 26 23:18:49 2011
@@ -21,80 +21,80 @@
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<!-- ServerInfo service -->
- <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
+ <!--<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>
+ <!--<gbean name="Repository" class="org.apache.geronimo.system.repository.Maven2Repository">-->
+ <!--<attribute name="root">repository/</attribute>-->
+ <!--<reference name="ServerInfo">-->
+ <!--<name>ServerInfo</name>-->
+ <!--</reference>-->
+ <!--</gbean>-->
<!--Configuration Store service-->
- <gbean name="Local" class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore">
- <reference name="Repository">
- <name>Repository</name>
- </reference>
- </gbean>
+ <!--<gbean name="Local" class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore">-->
+ <!--<reference name="Repository">-->
+ <!--<name>Repository</name>-->
+ <!--</reference>-->
+ <!--</gbean>-->
<!-- ArtifactManager -->
- <gbean name="ArtifactManager" class="org.apache.geronimo.kernel.repository.DefaultArtifactManager"/>
+ <!--<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"></reference>
- <attribute name="versionMapLocation">var/config/artifact_aliases.properties</attribute>
- <attribute name="additionalAliases">
- org.apache.geronimo.framework/j2ee-system//car=org.apache.geronimo.framework/online-deployer/${version}/car
- org.apache.geronimo.framework/j2ee-system/${version}/car=org.apache.geronimo.framework/online-deployer/${version}/car
- </attribute>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
- </gbean>
+ <!--<gbean name="ArtifactResolver" class="org.apache.geronimo.system.resolver.ExplicitDefaultArtifactResolver">-->
+ <!--<reference name="ArtifactManager">-->
+ <!--<name>ArtifactManager</name>-->
+ <!--</reference>-->
+ <!--<reference name="Repositories"></reference>-->
+ <!--<attribute name="versionMapLocation">var/config/artifact_aliases.properties</attribute>-->
+ <!--<attribute name="additionalAliases">-->
+ <!--org.apache.geronimo.framework/j2ee-system//car=org.apache.geronimo.framework/online-deployer/${version}/car-->
+ <!--org.apache.geronimo.framework/j2ee-system/${version}/car=org.apache.geronimo.framework/online-deployer/${version}/car-->
+ <!--</attribute>-->
+ <!--<reference name="ServerInfo">-->
+ <!--<name>ServerInfo</name>-->
+ <!--</reference>-->
+ <!--</gbean>-->
<!--User-editable attribute service-->
<gbean name="AttributeManager" class="org.apache.geronimo.system.configuration.LocalAttributeManager">
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
+ <!--<reference name="ServerInfo">-->
+ <!--<name>ServerInfo</name>-->
+ <!--</reference>-->
<attribute name="readOnly">true</attribute>
<attribute name="configFile">var/config/jsr88-configurer-config.xml</attribute>
</gbean>
<!--Server attribute service-->
<gbean name="ServerAttributeManager" class="org.apache.geronimo.system.configuration.SwitchableLocalAttributeManager">
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
+ <!--<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>
<!--Configuration Manager service-->
- <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.KernelConfigurationManager">
- <reference name="Repositories"></reference>
- <reference name="Stores"></reference>
- <reference name="Watchers"></reference>
- <reference name="AttributeStore">
- <name>ServerAttributeManager</name>
- </reference>
- <reference name="PersistentConfigurationList">
- <type>AttributeStore</type>
- <name>ServerAttributeManager</name>
- </reference>
- <reference name="ArtifactManager">
- <name>ArtifactManager</name>
- </reference>
- <reference name="ArtifactResolver">
- <name>ArtifactResolver</name>
- </reference>
- </gbean>
+ <!--<gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.KernelConfigurationManager">-->
+ <!--<reference name="Repositories"></reference>-->
+ <!--<reference name="Stores"></reference>-->
+ <!--<reference name="Watchers"></reference>-->
+ <!--<reference name="AttributeStore">-->
+ <!--<name>ServerAttributeManager</name>-->
+ <!--</reference>-->
+ <!--<reference name="PersistentConfigurationList">-->
+ <!--<type>AttributeStore</type>-->
+ <!--<name>ServerAttributeManager</name>-->
+ <!--</reference>-->
+ <!--<reference name="ArtifactManager">-->
+ <!--<name>ArtifactManager</name>-->
+ <!--</reference>-->
+ <!--<reference name="ArtifactResolver">-->
+ <!--<name>ArtifactResolver</name>-->
+ <!--</reference>-->
+ <!--</gbean>-->
<!-- System Properties -->
<gbean name="ServerSystemProperties" class="org.apache.geronimo.system.properties.SystemProperties">
@@ -103,18 +103,18 @@
</attribute>
</gbean>
- <gbean name="ConfigurationExtender" class="org.apache.geronimo.system.configuration.ConfigurationExtender">
- <reference name="ConfigurationManager">
- <name>ConfigurationManager</name>
- </reference>
- <reference name="DependencyManager">
- <name>DependencyManager</name>
- </reference>
- </gbean>
-
- <gbean name="DependencyManager" class="org.apache.geronimo.system.configuration.DependencyManager">
- <reference name="Repositories"></reference>
- </gbean>
+ <!--<gbean name="ConfigurationExtender" class="org.apache.geronimo.system.configuration.ConfigurationExtender">-->
+ <!--<reference name="ConfigurationManager">-->
+ <!--<name>ConfigurationManager</name>-->
+ <!--</reference>-->
+ <!--<reference name="DependencyManager">-->
+ <!--<name>DependencyManager</name>-->
+ <!--</reference>-->
+ <!--</gbean>-->
+
+ <!--<gbean name="DependencyManager" class="org.apache.geronimo.system.configuration.DependencyManager">-->
+ <!--<reference name="Repositories"></reference>-->
+ <!--</gbean>-->
<!-- Logging service -->
<!--
@@ -127,6 +127,6 @@
</gbean>
-->
- <gbean name="DeployerBridge" class="org.apache.geronimo.system.main.MainBridge"/>
+ <!--<gbean name="DeployerBridge" class="org.apache.geronimo.system.main.MainBridge"/>-->
</module>
Modified: geronimo/server/trunk/framework/configs/plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/plugin/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/plugin/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/plugin/pom.xml Tue Apr 26 23:18:49 2011
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>configs</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -35,16 +35,9 @@
<description>Plugin management services including the installer.</description>
<dependencies>
+
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>rmi-naming</artifactId>
<version>${project.version}</version>
<type>car</type>
@@ -82,6 +75,11 @@
<artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.ant</artifactId>
+ </dependency>
+
</dependencies>
<build>
Modified: geronimo/server/trunk/framework/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/pom.xml Tue Apr 26 23:18:49 2011
@@ -28,13 +28,13 @@
<version>3.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>configs</artifactId>
<name>Geronimo Framework, Configs</name>
<packaging>pom</packaging>
<modules>
- <module>geronimo-gbean-deployer</module>
- <!--<module>geronimo-gbean-deployer-bootstrap</module>-->
+ <!--<module>geronimo-gbean-deployer</module>-->
<module>client-system</module>
<module>j2ee-security</module>
<module>j2ee-system</module>
@@ -47,7 +47,6 @@
<module>server-security-config</module>
<module>shutdown</module>
<module>jmx-security</module>
- <module>karaf-framework</module>
</modules>
<build>
Modified: geronimo/server/trunk/framework/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/pom.xml Tue Apr 26 23:18:49 2011
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>configs</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -35,16 +35,9 @@
<description>Fundamental geronimo services including the plugin installer.</description>
<dependencies>
+
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>j2ee-system</artifactId>
<version>${project.version}</version>
<type>car</type>
@@ -91,6 +84,15 @@
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-naming</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
@@ -121,10 +123,6 @@
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>car-maven-plugin</artifactId>
<configuration>
- <deploymentConfigs>
- <deploymentConfig>${gbeanDeployerBootstrap}</deploymentConfig>
- </deploymentConfigs>
- <deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
<category>Geronimo Core</category>
<instance>
<plugin-artifact>
Modified: geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml Tue Apr 26 23:18:49 2011
@@ -32,11 +32,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy.api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-blueprint</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/framework/configs/server-security-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/server-security-config/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/server-security-config/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/server-security-config/pom.xml Tue Apr 26 23:18:49 2011
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>configs</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -35,26 +35,47 @@
<description>Sample security configuration for a demo geronimo server. Not suitable for production use.</description>
<dependencies>
+ <!-- parent -->
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
+ <artifactId>j2ee-security</artifactId>
<version>${project.version}</version>
<type>car</type>
- <scope>provided</scope>
</dependency>
-
- <!-- parent -->
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>j2ee-security</artifactId>
+ <artifactId>geronimo-security</artifactId>
<version>${project.version}</version>
- <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaspic_1.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jacc_1.4_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-jaspi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>sxc-jaxb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>sxc-runtime</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-security</artifactId>
+ <artifactId>geronimo-management</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -63,9 +84,6 @@
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>car-maven-plugin</artifactId>
<configuration>
- <deploymentConfigs>
- <deploymentConfig>${gbeanDeployer}</deploymentConfig>
- </deploymentConfigs>
<category>Security</category>
<instance>
<plugin-artifact>
Modified: geronimo/server/trunk/framework/configs/shutdown/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/shutdown/pom.xml?rev=1096951&r1=1096950&r2=1096951&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/shutdown/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/shutdown/pom.xml Tue Apr 26 23:18:49 2011
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.framework</groupId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>configs</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -33,13 +33,6 @@
<packaging>car</packaging>
<dependencies>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
@@ -66,9 +59,37 @@
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-cli</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+ </dependency>
+ <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-deploy-jsr88</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-plugin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.ant</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -77,7 +98,6 @@
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>car-maven-plugin</artifactId>
<configuration>
- <boot>true</boot>
<archive>
<manifestEntries>
<Endorsed-Dirs>lib/endorsed</Endorsed-Dirs>