geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r344274 - in /geronimo/trunk: assemblies/j2ee-server/ assemblies/j2ee-server/src/var/config/ configs/console-jetty/ configs/console-jetty/src/plan/ configs/geronimo-gbean-deployer/src/plan/ configs/j2ee-deployer/src/plan/ configs/welcome-je...
Date Mon, 14 Nov 2005 23:51:24 GMT
Author: djencks
Date: Mon Nov 14 15:51:19 2005
New Revision: 344274

URL: http://svn.apache.org/viewcvs?rev=344274&view=rev
Log:
Now possible to build a server with the assembly plugin

Modified:
    geronimo/trunk/assemblies/j2ee-server/project.xml
    geronimo/trunk/assemblies/j2ee-server/src/var/config/config.xml
    geronimo/trunk/configs/console-jetty/project.xml
    geronimo/trunk/configs/console-jetty/src/plan/plan.xml
    geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml
    geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
    geronimo/trunk/configs/welcome-jetty/project.xml

Modified: geronimo/trunk/assemblies/j2ee-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-server/project.xml?rev=344274&r1=344273&r2=344274&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-server/project.xml Mon Nov 14 15:51:19 2005
@@ -282,6 +282,15 @@
 
         <dependency>
             <groupId>openejb</groupId>
+            <artifactId>openejb-pkgen-builder</artifactId>
+            <version>${openejb_version}</version>
+            <properties>
+                <geronimo.assemble>repository</geronimo.assemble>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>openejb</groupId>
             <artifactId>openejb-builder</artifactId>
             <version>${openejb_version}</version>
             <properties>
@@ -305,8 +314,7 @@
             <artifactId>xercesImpl</artifactId>
             <version>${xerces_version}</version>
             <properties>
-                <endorsed>true</endorsed>
-                <geronimo.assemble>repository</geronimo.assemble>
+                <geronimo.assemble>endorsed</geronimo.assemble>
             </properties>
         </dependency>
 
@@ -315,8 +323,7 @@
             <artifactId>xmlParserAPIs</artifactId>
             <version>${xml_parser_apis_version}</version>
             <properties>
-                <endorsed>true</endorsed>
-                <geronimo.assemble>repository</geronimo.assemble>
+                <geronimo.assemble>endorsed</geronimo.assemble>
             </properties>
         </dependency>
 
@@ -1114,6 +1121,14 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>geronimo-servicemix-builder</artifactId>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>repository</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${pom.currentVersion}</version>
             <properties>
@@ -1252,9 +1267,9 @@
                 <geronimo.assemble>install</geronimo.assemble>
             </properties>
         </dependency>
-<!--        <dependency>
+        <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-welcome</artifactId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>
@@ -1263,14 +1278,41 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-console</artifactId>
+            <artifactId>j2ee-deployer</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
             </properties>
         </dependency>
--->
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>jetty-deployer</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>welcome-jetty</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>webconsole-jetty</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>
+
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-assembly-plugin</artifactId>

Modified: geronimo/trunk/assemblies/j2ee-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-server/src/var/config/config.xml?rev=344274&r1=344273&r2=344274&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-server/src/var/config/config.xml (original)
+++ geronimo/trunk/assemblies/j2ee-server/src/var/config/config.xml Mon Nov 14 15:51:19 2005
@@ -10,12 +10,61 @@
             <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/cars/j2ee-deployer-${pom.currentVersion}.car" load="false">
-        <gbean name="WebBuilder">
-            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0</attribute>
+    <configuration name="geronimo/cars/jetty-${pom.currentVersion}.car">
+        <gbean name="JettyWebConnector">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanHTTPPortPrimary}</attribute>
+            <attribute name="redirectPort">${PlanHTTPSPortPrimary}</attribute>
         </gbean>
-        <gbean name="EJBBuilder">
-            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Jetty,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
+        <gbean name="JettySSLConnector">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanHTTPSPortPrimary}</attribute>
+        </gbean>
+    </configuration>
+    <configuration name="geronimo/cars/j2ee-server-${pom.currentVersion}.car">
+        <gbean name="openejb:type=NetworkService,name=EJB">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanOpenEJBPort}</attribute>
+        </gbean>
+    </configuration>
+    <configuration name="geronimo/cars/j2ee-security-${pom.currentVersion}.car">
+        <gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanRemoteLoginPort}</attribute>
+        </gbean>
+        <gbean name="JMXConnector">
+            <attribute name="url">service:jmx:rmi://${PlanServerHostname}/jndi/rmi:/JMXConnector</attribute>
+        </gbean>
+    </configuration>
+    <configuration name="geronimo/cars/j2ee-corba-${pom.currentVersion}.car" load="false">
+        <gbean name="NameServer">
+            <attribute name="dbDir">var/cosnaming.db</attribute>
+            <attribute name="port">${PlanCOSNamingPort}</attribute>
+        </gbean>
+        <gbean name="Server">
+            <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
+        </gbean>
+        <gbean name="UnprotectedServer">
+            <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
+        </gbean>
+    </configuration>
+    <configuration name="geronimo/cars/activemq-broker-${pom.currentVersion}.car">
+        <gbean name="ActiveMQ.tcp.default">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanActiveMQPort}</attribute>
+        </gbean>
+    </configuration>
+    <configuration name="geronimo/cars/activemq-${pom.currentVersion}.car"/>
+    <configuration name="geronimo/cars/system-database-${pom.currentVersion}.car">
+        <gbean name="DerbyNetwork">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanDerbyPort}</attribute>
+        </gbean>
+    </configuration>
+    <configuration name="geronimo/cars/directory-${pom.currentVersion}.car">
+        <gbean name="geronimo.server:name=DirectoryService">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanLdapPort}</attribute>
         </gbean>
     </configuration>
     <configuration name="geronimo/cars/jetty-${pom.currentVersion}.car">
@@ -75,7 +124,16 @@
             <attribute name="port">${PlanLdapPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/cars/jetty-deployer-${pom.currentVersion}.car" load="false"/>
-    <configuration name="org/apache/geronimo/applications/Welcome/Jetty" load="false"/>
-    <configuration name="org/apache/geronimo/Console/Jetty" load="false"/>
+    <configuration name="geronimo/cars/geronimo-gbean-deployer-${pom.currentVersion}.car"/>
+    <configuration name="geronimo/cars/j2ee-deployer-${pom.currentVersion}.car">
+        <gbean name="WebBuilder">
+            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0</attribute>
+        </gbean>
+        <gbean name="EJBBuilder">
+            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Jetty,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
+        </gbean>
+    </configuration>
+    <configuration name="geronimo/cars/jetty-deployer-${pom.currentVersion}.car"/>
+    <configuration name="geronimo/cars/welcome-jetty-${pom.currentVersion}.car"/>
+    <configuration name="geronimo/cars/webconsole-jetty-${pom.currentVersion}.car"/>
 </attributes>

Modified: geronimo/trunk/configs/console-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/console-jetty/project.xml?rev=344274&r1=344273&r2=344274&view=diff
==============================================================================
--- geronimo/trunk/configs/console-jetty/project.xml (original)
+++ geronimo/trunk/configs/console-jetty/project.xml Mon Nov 14 15:51:19 2005
@@ -20,8 +20,8 @@
 
 <project>
     <pomVersion>3</pomVersion>
-    <extend>../jetty-deployer/project.xml</extend>
-<!--    <extend>../../etc/project.xml</extend>-->
+<!--    <extend>../jetty-deployer/project.xml</extend>-->
+    <extend>../../etc/project.xml</extend>
     <id>webconsole-jetty</id>
     <name>Web console deployed on jetty</name>
 
@@ -32,13 +32,54 @@
             <artifactId>j2ee-server</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <properties>
+                 <geronimo.import>true</geronimo.import>
+             </properties>
         </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-console</artifactId>
-            <version>${geronimo_version}</version>
-            <type>ear</type>
-        </dependency>
+
+    <dependency>
+        <groupId>portlet-api</groupId>
+        <artifactId>portlet-api</artifactId>
+        <version>${portlet_api_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.pluto</groupId>
+        <artifactId>pluto</artifactId>
+        <version>${pluto_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-console-core</artifactId>
+        <version>${geronimo_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-management</artifactId>
+        <version>${geronimo_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+    </dependency>
+
+    <!-- Keystore dependency -->
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-util</artifactId>
+        <version>${geronimo_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+    </dependency>
+
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-system</artifactId>

Modified: geronimo/trunk/configs/console-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/console-jetty/src/plan/plan.xml?rev=344274&r1=344273&r2=344274&view=diff
==============================================================================
--- geronimo/trunk/configs/console-jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/console-jetty/src/plan/plan.xml Mon Nov 14 15:51:19 2005
@@ -5,7 +5,7 @@
     >
 
     <!-- these dependencies must be kept here so that their classes are loaded in the
"EARs" classloader. -->
-    <dependency>
+<!--    <dependency>
         <groupId>portlet-api</groupId>
         <artifactId>portlet-api</artifactId>
         <version>${portlet_api_version}</version>
@@ -26,12 +26,14 @@
         <version>${geronimo_version}</version>
     </dependency>
 
-    <!-- Keystore dependency -->
+  
     <dependency>
         <groupId>geronimo</groupId>
         <artifactId>geronimo-util</artifactId>
         <version>${geronimo_version}</version>
-    </dependency>
+    </dependency>-->
+
+
     <module>
         <web>geronimo-console-framework-${pom.currentVersion}.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0" configId="console">
@@ -64,11 +66,16 @@
     <!-- Console specific server info -->
     <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
         <reference name="ServerInfo">
-            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/System,J2EEServer=geronimo,j2eeType=GBean,name=ServerInfo</gbean-name>
+            <application>null</application>
+            <moduleType>J2EEModule</moduleType>
+            <module>${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car</module>
+            <name>ServerInfo</name>
         </reference>
         <reference name="LoginModule">
-            <!--            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=LoginModule,name=properties-login</gbean-name>-->
-            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Security,J2EEServer=geronimo,j2eeType=LoginModule,name=properties-login</gbean-name>
+            <application>null</application>
+            <moduleType>J2EEModule</moduleType>
+            <module>${pom.groupId}/cars/j2ee-security-${pom.currentVersion}.car</module>
+            <name>properties-login</name>
         </reference>
     </gbean>
 
@@ -81,8 +88,7 @@
         <reference name="serverInfo">
             <application>null</application>
             <moduleType>J2EEModule</moduleType>
-            <module>org/apache/geronimo/System</module>
-            <type>GBean</type>
+            <module>${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car</module>
             <name>ServerInfo</name>
         </reference>
     </gbean>

Modified: geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml?rev=344274&r1=344273&r2=344274&view=diff
==============================================================================
--- geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml Mon Nov 14 15:51:19 2005
@@ -60,9 +60,11 @@
 
     <!-- Deployer used to process modules and plans -->
     <gbean gbeanName="geronimo.maven:name=Deployer,j2eeType=Deployer,J2EEModule=${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
class="org.apache.geronimo.deployment.Deployer">
-        <reference name="Store">
-            <gbean-name>geronimo.maven:name=MavenConfigStore,j2eeType=ConfigurationStore</gbean-name>
-        </reference>
+        <references name="Store">
+            <!--gbean-name>geronimo.maven:name=MavenConfigStore,j2eeType=ConfigurationStore</gbean-name-->
+            <pattern><gbean-name>geronimo.maven:name=MavenConfigStore,j2eeType=ConfigurationStore</gbean-name></pattern>
+            <pattern><gbean-name>geronimo.server:j2eeType=ConfigurationStore,name=Local</gbean-name></pattern>
+         </references>
         <reference name="Builders">
             <gbean-name>geronimo.maven:j2eeType=ConfigBuilder,*</gbean-name>
         </reference>
@@ -71,9 +73,10 @@
     <!-- Builder for handling plans defining Geronimo configurations -->
     <gbean name="ServiceBuilder" class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
         <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
-        <reference name="Repository">
-            <gbean-name>geronimo.maven:name=Repository</gbean-name>
-        </reference>
+        <references name="Repository">
+            <pattern><gbean-name>geronimo.maven:name=Repository</gbean-name></pattern>
+            <pattern><gbean-name>geronimo.server:name=Repository,*</gbean-name></pattern>
+        </references>
         <reference name="XmlAttributeBuilders">
             <module>*</module>
             <name>*</name>

Modified: geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml?rev=344274&r1=344273&r2=344274&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml Mon Nov 14 15:51:19 2005
@@ -239,10 +239,11 @@
         <reference name="ServiceReferenceBuilder">
             <name>WebServiceBuilder</name>
         </reference>
-        <reference name="Store">
+        <references name="Store">
             <!-- todo replace with a store the Client Builder can write to -->
-            <gbean-name>geronimo.maven:name=MavenConfigStore,j2eeType=ConfigurationStore</gbean-name>
-        </reference>
+            <pattern><gbean-name>geronimo.maven:name=MavenConfigStore,j2eeType=ConfigurationStore</gbean-name></pattern>
+            <pattern><gbean-name>geronimo.server:j2eeType=ConfigurationStore,name=Local</gbean-name></pattern>
+        </references>
         <reference name="Repository">
             <gbean-name>*:name=Repository,*</gbean-name>
         </reference>

Modified: geronimo/trunk/configs/welcome-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/welcome-jetty/project.xml?rev=344274&r1=344273&r2=344274&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-jetty/project.xml (original)
+++ geronimo/trunk/configs/welcome-jetty/project.xml Mon Nov 14 15:51:19 2005
@@ -21,8 +21,8 @@
 <project>
     <pomVersion>3</pomVersion>
     <extend>../../etc/project.xml</extend>
-    <id>system-database</id>
-    <name>System Database Configuration for the J2EE Server</name>
+    <id>welcome-jetty</id>
+    <name>Welcome app for Jetty</name>
 
     <dependencies>
         <!-- parent config -->



Mime
View raw message