geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r809078 [3/12] - in /geronimo/sandbox/djencks/osgi/framework: ./ assemblies/ assemblies/geronimo-framework/ buildsupport/ buildsupport/buildsupport-maven-plugin/ buildsupport/car-maven-plugin/ buildsupport/car-maven-plugin/src/main/java/org...
Date Sat, 29 Aug 2009 00:51:37 GMT
Modified: geronimo/sandbox/djencks/osgi/framework/configs/j2ee-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/j2ee-security/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/j2ee-security/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/j2ee-security/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
     
     <!-- change this to server-security -->

Modified: geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>j2ee-system</artifactId>
@@ -93,8 +93,8 @@
 
         <!-- used by plugin installer -->
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
         </dependency>
         
         <dependency>
@@ -190,6 +190,11 @@
                         </element>
                         <element>
                             <groupId>org.apache.geronimo.framework</groupId>
+                            <artifactId>geronimo-crypto</artifactId>
+                            <version>${version}</version>
+                        </element>
+                        <element>
+                            <groupId>org.apache.geronimo.framework</groupId>
                             <artifactId>geronimo-kernel</artifactId>
                             <version>${version}</version>
                         </element>
@@ -258,7 +263,7 @@
                     <classpathPrefix>../lib</classpathPrefix>
 
                     <category>Geronimo Core</category>
-                    <config-xml-content load = "false"/>
+                    <config-xml-content load="false" />
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/jee-specs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/jee-specs/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/jee-specs/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/jee-specs/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jee-specs</artifactId>
@@ -51,12 +51,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>ejb31-api-experimental</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
         </dependency>
 
         <dependency>
@@ -71,7 +66,6 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <!--<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>-->
             <artifactId>${connectorSpec}</artifactId>
         </dependency>
 
@@ -87,7 +81,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaspi_1.0_spec</artifactId>
+            <artifactId>geronimo-jaspic_1.0_spec</artifactId>
         </dependency>
 
         <!-- NOTA BENE: use the org.apache.geronimo.javamail/geronimo-javamail_1.4_mail uber jar
@@ -116,7 +110,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_3.0_spec</artifactId>
+            <artifactId>geronimo-jpa_1.0_spec</artifactId>
         </dependency>
 
         <dependency>
@@ -149,8 +143,8 @@
         -->
         <!--
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
         </dependency>
         -->
         <!-- JAXB Impl should not be here! -->
@@ -176,7 +170,7 @@
         </dependency>
 
         <dependency>
-            <groupId>jstl</groupId>
+            <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
         </dependency>
 

Propchange: geronimo/sandbox/djencks/osgi/framework/configs/jmx-security/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+*.ipr
+*.iml
+*.iws
+*.log
+*~
+.project
+.classpath
+target
+

Modified: geronimo/sandbox/djencks/osgi/framework/configs/jmx-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/jmx-security/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/jmx-security/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/jmx-security/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
     
     <artifactId>jmx-security</artifactId>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jsr88-cli</artifactId>
@@ -104,8 +104,8 @@
 
         <!-- used by plugin installer -->
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
@@ -135,7 +135,7 @@
                     <category>Deployment</category>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="jsr88"/>
+                            <config-xml-content server="jsr88" />
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/jsr88-deploymentfactory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/jsr88-deploymentfactory/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/jsr88-deploymentfactory/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/jsr88-deploymentfactory/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jsr88-deploymentfactory</artifactId>
@@ -83,8 +83,8 @@
         
         <!-- used by plugin installer -->
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
         </dependency>
         
         <dependency>
@@ -126,6 +126,11 @@
                     <classpath>
                         <element>
                             <groupId>org.apache.geronimo.framework</groupId>
+                            <artifactId>geronimo-crypto</artifactId>
+                            <version>${version}</version>
+                        </element>
+                        <element>
+                            <groupId>org.apache.geronimo.framework</groupId>
                             <artifactId>geronimo-kernel</artifactId>
                             <version>${version}</version>
                         </element>
@@ -180,7 +185,7 @@
                     <category>Deployment</category>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="jsr88" load="false"/>
+                            <config-xml-content server="jsr88" load="false" />
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/offline-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/offline-deployer/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/offline-deployer/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/offline-deployer/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>offline-deployer</artifactId>
@@ -60,7 +60,7 @@
                     <category>Deployment</category>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content load="false"/>
+                            <config-xml-content load="false" />
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>online-deployer</artifactId>
@@ -94,10 +94,10 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
@@ -146,6 +146,11 @@
                         </element>
                         <element>
                             <groupId>org.apache.geronimo.framework</groupId>
+                            <artifactId>geronimo-crypto</artifactId>
+                            <version>${version}</version>
+                        </element>
+                        <element>
+                            <groupId>org.apache.geronimo.framework</groupId>
                             <artifactId>geronimo-kernel</artifactId>
                             <version>${version}</version>
                         </element>
@@ -202,7 +207,7 @@
                     <category>Deployment</category>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content load="false"/>
+                            <config-xml-content load="false" />
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/plugin/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/plugin/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/plugin/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugin</artifactId>
@@ -62,7 +62,7 @@
             <!--<artifactId>geronimo-deploy-jsr88</artifactId>-->
             <!--<version>${version}</version>-->
         <!--</dependency>-->
-        <!---->
+        
         <!--<dependency>-->
             <!--<groupId>org.apache.geronimo.framework</groupId>-->
             <!--<artifactId>geronimo-deploy-config</artifactId>-->

Modified: geronimo/sandbox/djencks/osgi/framework/configs/plugin/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/plugin/src/main/plan/plan.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/plugin/src/main/plan/plan.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/plugin/src/main/plan/plan.xml Sat Aug 29 00:51:12 2009
@@ -111,7 +111,7 @@
     </gbean>
 
     <gbean name="NewServerInstance" class="org.apache.geronimo.system.plugin.NewServerInstanceGBean">
-        <attribute name="defaultPlugins">org.apache.geronimo.plugingroups/framework/${version}/car</attribute>
+        <attribute name="defaultPlugins">org.apache.geronimo.framework.plugingroups/framework/${version}/car</attribute>
         <reference name="PluginInstallerGBean">
             <name>PluginInstaller</name>
         </reference>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/plugin/src/main/resources/plugin-repositories.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/plugin/src/main/resources/plugin-repositories.properties?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/plugin/src/main/resources/plugin-repositories.properties (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/plugin/src/main/resources/plugin-repositories.properties Sat Aug 29 00:51:12 2009
@@ -1,3 +1,18 @@
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
 #List of known plugin repositories. Fomat:  <url>=<username>=<password>
 ~/.m2/repository
 http\://localhost\:8080/plugin/maven-repo/=system=manager
\ No newline at end of file

Modified: geronimo/sandbox/djencks/osgi/framework/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>framework</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
     
     <artifactId>configs</artifactId>
@@ -86,7 +86,6 @@
                             <source-repository>~/.m2/repository/</source-repository>
                             <source-repository>http://repo1.maven.org/maven2/</source-repository>
                             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-                            <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
                             <artifact-alias key="${groupId}/${artifactId}//car">${groupId}/${artifactId}/${version}/car</artifact-alias>
                         </plugin-artifact>
                     </commonInstance>
@@ -95,4 +94,18 @@
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>all-subprojects</id>
+            <!-- use for things like versions:set and perhaps release when build has to run on all projects -->
+            <modules>
+                <module>geronimo-gbean-deployer/src/it/j2ee-system</module>
+                <module>geronimo-gbean-deployer/src/it/j2ee-system-2</module>
+                <module>geronimo-gbean-deployer/src/it/metadatageneration</module>
+                <module>geronimo-gbean-deployer/src/it/metadatageneration-2</module>
+            </modules>
+        </profile>
+
+    </profiles>
+
 </project>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>rmi-naming</artifactId>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
     
     <artifactId>server-security-config</artifactId>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/shutdown/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/shutdown/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/shutdown/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/shutdown/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>shutdown</artifactId>
@@ -98,6 +98,11 @@
                     <classpath>
                         <element>
                             <groupId>org.apache.geronimo.framework</groupId>
+                            <artifactId>geronimo-crypto</artifactId>
+                            <version>${version}</version>
+                        </element>
+                        <element>
+                            <groupId>org.apache.geronimo.framework</groupId>
                             <artifactId>geronimo-kernel</artifactId>
                             <version>${version}</version>
                         </element>
@@ -130,7 +135,7 @@
                     <category>Geronimo Core</category>
 \                    <instance>
                         <plugin-artifact>
-                            <config-xml-content load="false"/>
+                            <config-xml-content load="false" />
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/transformer-agent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/transformer-agent/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/transformer-agent/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/transformer-agent/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
     
     <artifactId>transformer-agent</artifactId>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/upgrade-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/upgrade-cli/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/upgrade-cli/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/upgrade-cli/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>upgrade-cli</artifactId>
@@ -78,7 +78,7 @@
                     <category>Deployment</category>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content load="false"/>
+                            <config-xml-content load="false" />
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/upgrade/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/upgrade/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/upgrade/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/upgrade/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
     
     <artifactId>upgrade</artifactId>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/xmlbeans/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/xmlbeans/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/xmlbeans/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>configs</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>xmlbeans</artifactId>

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -1,10 +1,9 @@
+.*
 *.iws
 *.ipr
 *.iml
-.classpath
-.project
-.settings
 *.log
 junit*.properties
+maven-eclipse.xml
 target
 bin

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/pom.xml Sat Aug 29 00:51:12 2009
@@ -1,54 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-    
-       http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<!-- $Rev: 613699 $ $Date: 2008-01-20 14:50:35 -0800 (Sun, 20 Jan 2008) $ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    
-    <parent>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>modules</artifactId>
-        <version>2.2-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>geronimo-cli</artifactId>
-    <name>Geronimo Framework, Modules :: CLI</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.testsupport</groupId>
-            <artifactId>testsupport-common</artifactId>
-            <version>${version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+    
+       http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 613699 $ $Date: 2008-01-20 14:50:35 -0800 (Sun, 20 Jan 2008) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>modules</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>geronimo-cli</artifactId>
+    <packaging>bundle</packaging>
+    <name>Geronimo Framework, Modules :: CLI</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.testsupport</groupId>
+            <artifactId>testsupport-common</artifactId>
+            <version>${version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
+

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/main/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/main/java/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/main/java/org/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/main/java/org/apache/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/AbstractCLI.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/AbstractCLI.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/AbstractCLI.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/AbstractCLI.java Sat Aug 29 00:51:12 2009
@@ -20,6 +20,8 @@
 
 import org.apache.geronimo.cli.CLParserException;
 import org.apache.geronimo.kernel.util.MainConfigurationBootstrapper;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
 
 /**
  * @version $Rev: 476049 $ $Date: 2006-11-17 15:35:17 +1100 (Fri, 17 Nov 2006) $
@@ -62,7 +64,8 @@
         initializeLogging(parser);
         
         MainConfigurationBootstrapper mainConfigurationBootstrapper = newMainConfigurationBootstrapper();
-        return MainConfigurationBootstrapper.main(mainConfigurationBootstrapper, parser);
+        BundleContext bundleContext = null;
+        return MainConfigurationBootstrapper.main(mainConfigurationBootstrapper, parser, bundleContext);
     }
 
     protected boolean executeCommand(CLParser parser) {

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/PrintHelper.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/PrintHelper.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/PrintHelper.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/PrintHelper.java Sat Aug 29 00:51:12 2009
@@ -41,9 +41,14 @@
  */
 public class PrintHelper {
 
-    public static String reformat(String source, int indent, int endCol) {
+    public static String reformat(String source, int indent, int width) {
+        int endCol = width;
+        if (endCol == 0) {
+            endCol = DEFAULT_WIDTH;
+        }
         if(endCol-indent < 10) {
-            throw new IllegalArgumentException("This is ridiculous!");
+            throw new IllegalArgumentException("Need at least 10 spaces for " +
+                "printing, but indent=" + indent + " and endCol=" + endCol);
         }
         StringBuffer buf = new StringBuffer((int)(source.length()*1.1));
         String prefix = indent == 0 ? "" : buildIndent(indent);

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/client/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/daemon/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/deployer/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/main/resources/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/test/java/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/test/java/org/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/test/java/org/apache/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/test/java/org/apache/geronimo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/test/java/org/apache/geronimo/cli/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/test/java/org/apache/geronimo/cli/client/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/test/java/org/apache/geronimo/cli/daemon/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-cli/src/test/java/org/apache/geronimo/cli/deployer/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-commands/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -1,11 +1,9 @@
+.*
 *.iws
 *.ipr
 *.iml
-.classpath
-.project
-.settings
 *.log
 junit*.properties
+maven-eclipse.xml
 target
 bin
-

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-commands/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-commands/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-commands/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-commands/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,10 +25,11 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>geronimo-commands</artifactId>
+    <packaging>bundle</packaging>
     <name>Geronimo Framework, Modules :: Commands</name>
 
     <dependencies>
@@ -72,24 +73,7 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-
-            <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>org/apache/geronimo/commands/version.properties</include>
-                </includes>
-            </resource>
-        </resources>
-        
+    <build>        
         <plugins>
             <plugin>
                 <groupId>org.codehaus.groovy.maven</groupId>
@@ -118,7 +102,7 @@
                         <configuration>
                             <extractors>
                                 <classComponentDescriptorExtractor>
-                                    <gleaner implementation="org.codehaus.plexus.cdc.gleaner.AnnotationComponentGleaner"/>
+                                    <gleaner implementation="org.codehaus.plexus.cdc.gleaner.AnnotationComponentGleaner" />
                                 </classComponentDescriptorExtractor>
                             </extractors>
                         </configuration>

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-commands/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-commands/src/main/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-commands/src/main/groovy/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-commands/src/main/groovy/org/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-commands/src/main/groovy/org/apache/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy Sat Aug 29 00:51:12 2009
@@ -135,7 +135,7 @@
                         }
                         
                         log.info("Using Java virtual machine: $javaVirtualMachine")
-                        node.setAttribute('jvm', javaVirtualMachine)
+                        node.setAttribute('jvm', javaVirtualMachine.absolutePath)
                     }
                     
                     javaFlags.each {

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-commands/src/main/resources/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-commands/src/main/resources/org/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-commands/src/main/resources/org/apache/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-commands/src/main/resources/org/apache/geronimo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-commands/src/main/resources/org/apache/geronimo/commands/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-common/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -1,10 +1,9 @@
+.*
 *.iws
 *.ipr
 *.iml
-.classpath
-.project
-.settings
 *.log
 junit*.properties
+maven-eclipse.xml
 target
 bin

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-common/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-common/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-common/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,10 +25,11 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>geronimo-common</artifactId>
+    <packaging>bundle</packaging>
     <name>Geronimo Framework, Modules :: Common</name>
     
     <dependencies>

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-common/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-common/src/main/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-common/src/main/java/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-common/src/main/java/org/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-common/src/main/java/org/apache/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-common/src/main/java/org/apache/geronimo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-common/src/main/java/org/apache/geronimo/common/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/PropertyEditors.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/PropertyEditors.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/PropertyEditors.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/PropertyEditors.java Sat Aug 29 00:51:12 2009
@@ -24,6 +24,7 @@
 import java.util.List;
 
 import org.apache.geronimo.kernel.ClassLoading;
+import org.osgi.framework.Bundle;
 
 /**
  * The property editor manager.  This orchestrates Geronimo usage of
@@ -124,6 +125,38 @@
             Thread.currentThread().setContextClassLoader(oldLoader);
         }
     }
+    public static PropertyEditor findEditor(String typeName, Bundle bundle) throws ClassNotFoundException {
+        // explicit argument checking is required.
+        if (typeName == null) {
+            throw new IllegalArgumentException("typeName is null");
+        }
+
+        Class type = null;
+        // load using the ClassLoading utility, which also manages arrays and primitive classes.
+        try {
+            type = ClassLoading.loadClass(typeName, bundle);
+        } catch (ClassNotFoundException e) {
+            // We also support anonymous inner class nesting of property editors.  In that situation,
+            // the package/class names are the same, but add on the inner class specifier.
+            // If this one fails, we jump directly out with the ClassNotFoundException.
+            type = ClassLoading.loadClass(typeName + "$PropertyEditor", bundle);
+        }
+
+        // The PropertyEditorManager class uses the context class loader for all of its resolution
+        // steps.  We need force PropertyManagerEditor to use our loader, so we override the
+        // current context loader.
+        ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
+        try {
+            //TODO OSGI broken
+//            Thread.currentThread().setContextClassLoader(bundle);
+            // now call the base findEditor() method that works directly from the property type.
+            return findEditor(type);
+        } finally {
+            // make sure we restore the context....this will happen even if findEditor()
+            // results in an exception.
+            Thread.currentThread().setContextClassLoader(oldLoader);
+        }
+    }
 
     /**
      * Get a property editor for a given property type.  This is like
@@ -236,7 +269,7 @@
     /**
      * Append additional package names to the property editor search path.
      *
-     * @param names The package names to append.
+     * @param newNames The package names to append.
      */
     public static void appendEditorSearchPath(List newNames) {
         // explicit argument checking is required.
@@ -260,7 +293,7 @@
     /**
      * Append an array of package names to the editor search path.
      *
-     * @param names A string array containing the added names.
+     * @param newNames A string array containing the added names.
      */
     public static void appendEditorSearchPath(String[] newNames) {
         // explicit argument checking is required.
@@ -278,7 +311,7 @@
     /**
      * Append a single package name to the editor search path.
      *
-     * @param name The new path name.
+     * @param newName The new path name.
      */
     public static void appendEditorSearchPath(String newName) {
         // explicit argument checking is required.

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-common/src/test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-common/src/test/java/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-common/src/test/java/org/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-common/src/test/java/org/apache/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-common/src/test/java/org/apache/geronimo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-common/src/test/java/org/apache/geronimo/common/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-common/src/test/java/org/apache/geronimo/common/propertyeditor/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/pom.xml Sat Aug 29 00:51:12 2009
@@ -25,10 +25,11 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>geronimo-config-groovy-transformer</artifactId>
+    <packaging>bundle</packaging>
     <name>Geronimo Framework, Modules :: Config Groovy Transformer</name>
     
     <dependencies>

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/ConfigurationDataBuilder.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/ConfigurationDataBuilder.groovy?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/ConfigurationDataBuilder.groovy (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/ConfigurationDataBuilder.groovy Sat Aug 29 00:51:12 2009
@@ -29,6 +29,7 @@
 import org.apache.geronimo.kernel.repository.Artifact
 import org.apache.geronimo.kernel.repository.Dependency
 
+
 /**
  *
  * @version $Rev:$ $Date:$

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/ConfigurationDataBuilder.groovy
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/GBeanAttributeAndReferenceBuilder.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/GBeanAttributeAndReferenceBuilder.groovy?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/GBeanAttributeAndReferenceBuilder.groovy (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/GBeanAttributeAndReferenceBuilder.groovy Sat Aug 29 00:51:12 2009
@@ -1,5 +1,39 @@
-/*
 * 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.
 */

package org.apache.geronimo.kernel.config.transformer

import org.apache.geronimo.gbean.GBeanInfo
import org.apache.geronimo.gbean.GBeanData
import org.apache.geronimo.gbean.GBeanDa
 ta
import org.apache.geronimo.kernel.repository.Version
import org.apache.geronimo.kernel.config.ConfigurationData
import org.apache.geronimo.kernel.repository.ImportType
import org.apache.geronimo.kernel.repository.Artifact
import org.apache.geronimo.kernel.repository.Dependency
-
/**
 *
 * @version $Rev:$ $Date:$
 */
class GBeanAttributeAndReferenceBuilder {
+/*
+ * 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.
+ */
+
+package org.apache.geronimo.kernel.config.transformer
+
+import org.apache.geronimo.gbean.GBeanInfo
+import org.apache.geronimo.gbean.GBeanData
+import org.apache.geronimo.gbean.GBeanData
+import org.apache.geronimo.kernel.repository.Version
+import org.apache.geronimo.kernel.config.ConfigurationData
+import org.apache.geronimo.kernel.repository.ImportType
+import org.apache.geronimo.kernel.repository.Artifact
+import org.apache.geronimo.kernel.repository.Dependency
+
+
+/**
+ *
+ * @version $Rev:$ $Date:$
+ */
+class GBeanAttributeAndReferenceBuilder {
     private final def configurationData
     private final def gbeanData
     
@@ -8,4 +42,48 @@
         assert null != gbeanData : 'gbeanData is required'
         this.configurationData = configurationData
         this.gbeanData = gbeanData
-    }
   
    def attribute(Map attributeInfo) {
        def throwUsage = {
            throw new GroovyScriptException('attribute usage: attribute(attributeName: attributeValue)')
        }

        def mapIter = attributeInfo.entrySet().iterator()
        if (!mapIter.hasNext()) {
            throwUsage()
        }
        
        def entry = mapIter.next()
        def key = entry.key
        def value = entry.value
        gbeanData.setAttribute(key, value)
    }
 
    def reference(Object[] referenceInfo) {
        def throwUsage = {
            throw new GroovyScriptException('reference usage: reference(referenceName) {pattern(patternValue)}')
        }
        
        if (2 != referenceInfo.length) {
            throwUsage()
        }
        
        def name = referenceInfo[0]
        if (!(name instanceof String)) {
            throwUsage()
        }
        
        def referenceDeclarationClosure = referenceInfo[1]
        if (!(referenceDeclarationClosure insta
 nceof Closure)) {
            throwUsage()
        }

        def referenceBuilder = new ReferenceBuilder()
        referenceDeclarationClosure.delegate = referenceBuilder
        referenceDeclarationClosure()
        
        gbeanData.setReferencePatterns(name, referenceBuilder.references)
    }

}
\ No newline at end of file
+    }
+   
+    def attribute(Map attributeInfo) {
+        def throwUsage = {
+            throw new GroovyScriptException('attribute usage: attribute(attributeName: attributeValue)')
+        }
+
+        def mapIter = attributeInfo.entrySet().iterator()
+        if (!mapIter.hasNext()) {
+            throwUsage()
+        }
+        
+        def entry = mapIter.next()
+        def key = entry.key
+        def value = entry.value
+        gbeanData.setAttribute(key, value)
+    }
+ 
+    def reference(Object[] referenceInfo) {
+        def throwUsage = {
+            throw new GroovyScriptException('reference usage: reference(referenceName) {pattern(patternValue)}')
+        }
+        
+        if (2 != referenceInfo.length) {
+            throwUsage()
+        }
+        
+        def name = referenceInfo[0]
+        if (!(name instanceof String)) {
+            throwUsage()
+        }
+        
+        def referenceDeclarationClosure = referenceInfo[1]
+        if (!(referenceDeclarationClosure instanceof Closure)) {
+            throwUsage()
+        }
+
+        def referenceBuilder = new ReferenceBuilder()
+        referenceDeclarationClosure.delegate = referenceBuilder
+        referenceDeclarationClosure()
+        
+        gbeanData.setReferencePatterns(name, referenceBuilder.references)
+    }
+
+}
\ No newline at end of file

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/GBeanAttributeAndReferenceBuilder.groovy
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/GBeanDataBuilder.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/GBeanDataBuilder.groovy?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/GBeanDataBuilder.groovy (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/GBeanDataBuilder.groovy Sat Aug 29 00:51:12 2009
@@ -1,5 +1,37 @@
-/*
 * 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.
 */

package org.apache.geronimo.kernel.config.transformer

import org.apache.geronimo.gbean.GBeanData
import org.apache.geronimo.kernel.repository.Version
import org.apache.geronimo.ker
 nel.config.ConfigurationData
import org.apache.geronimo.kernel.repository.ImportType
import org.apache.geronimo.kernel.repository.Artifact
import org.apache.geronimo.kernel.repository.Dependency
-
/**
 *
 * @version $Rev:$ $Date:$
 */
class GBeanDataBuilder {
+/*
+ * 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.
+ */
+
+package org.apache.geronimo.kernel.config.transformer
+
+import org.apache.geronimo.gbean.GBeanData
+import org.apache.geronimo.kernel.repository.Version
+import org.apache.geronimo.kernel.config.ConfigurationData
+import org.apache.geronimo.kernel.repository.ImportType
+import org.apache.geronimo.kernel.repository.Artifact
+import org.apache.geronimo.kernel.repository.Dependency
+
+
+/**
+ *
+ * @version $Rev:$ $Date:$
+ */
+class GBeanDataBuilder {
     private final def configurationData
     private final def gbeanDatas
     
@@ -8,6 +40,44 @@
         assert null != gbeanDatas : 'gbeanDatas is required'
         this.configurationData = configurationData
         this.gbeanDatas = gbeanDatas
-    }
    
    def configure (Closure closure) {
        closure.delegate = this
        closure()
    }
+    }
+    
+    def configure (Closure closure) {
+        closure.delegate = this
+        closure()
+    }
+
+    def addGBean(Map gbeanDeclaration, Closure gbeanClosure) {
+        def throwUsage = {
+            throw new GroovyScriptException('addGBean usage: addGBean(name: gbeanName, gbean: gbeanClass, type: gbeanType)')
+        }
 
-    def addGBean(Map gbeanDeclaration, Closure gbeanClosure) {
        def throwUsage = {
            throw new GroovyScriptException('addGBean usage: addGBean(name: gbeanName, gbean: gbeanClass, type: gbeanType)')
        }

        if (!gbeanDeclaration.name) {
            throwUsage()
        } else if (!gbeanDeclaration.gbean) {
            throwUsage()
        }

        def gbeanName = buildGBeanName(gbeanDeclaration)
        def gbean = gbeanDeclaration.gbean 
        def gbeanData = new GBeanData(gbeanName, gbean)

        gbeanClosure.delegate = new GBeanAttributeAndReferenceBuilder(configurationData, gbeanData)
        gbeanClosure()

        gbeanDatas.push(gbeanData)
    }
    
    protected def buildGBeanName(gbeanDeclaration) throws GroovyScriptException {
        def name = gbeanDeclaration.name

        def type = gbeanDeclaration.type
        if (!type) {
            type = 'GBean'
        }
        
        def naming = configurationData.naming
        nami
 ng.createRootName(configurationData.environment.configId, name, type)
    }
    
}
\ No newline at end of file
+        if (!gbeanDeclaration.name) {
+            throwUsage()
+        } else if (!gbeanDeclaration.gbean) {
+            throwUsage()
+        }
+
+        def gbeanName = buildGBeanName(gbeanDeclaration)
+        def gbean = gbeanDeclaration.gbean 
+        def gbeanData = new GBeanData(gbeanName, gbean)
+
+        gbeanClosure.delegate = new GBeanAttributeAndReferenceBuilder(configurationData, gbeanData)
+        gbeanClosure()
+
+        gbeanDatas.push(gbeanData)
+    }
+    
+    protected def buildGBeanName(gbeanDeclaration) throws GroovyScriptException {
+        def name = gbeanDeclaration.name
+
+        def type = gbeanDeclaration.type
+        if (!type) {
+            type = 'GBean'
+        }
+        
+        def naming = configurationData.naming
+        naming.createRootName(configurationData.environment.configId, name, type)
+    }
+    
+}
\ No newline at end of file

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/GBeanDataBuilder.groovy
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/ReferenceBuilder.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/ReferenceBuilder.groovy?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/ReferenceBuilder.groovy (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/ReferenceBuilder.groovy Sat Aug 29 00:51:12 2009
@@ -1,5 +1,52 @@
-/*
 * 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.
 */

package org.apache.geronimo.kernel.config.transformer

import org.apache.geronimo.gbean.AbstractNameQuery
import org.apache.geronimo.gbean.GBeanInfo
import org.apache.geronimo.gbean
 .GBeanData
import org.apache.geronimo.gbean.GBeanData
import org.apache.geronimo.kernel.repository.Version
import org.apache.geronimo.kernel.config.ConfigurationData
import org.apache.geronimo.kernel.repository.ImportType
import org.apache.geronimo.kernel.repository.Artifact
import org.apache.geronimo.kernel.repository.Dependency
-
/**
 *
 * @version $Rev:$ $Date:$
 */
class ReferenceBuilder {
-    Set references
    
+/*
+ * 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.
+ */
+
+package org.apache.geronimo.kernel.config.transformer
+
+import org.apache.geronimo.gbean.AbstractNameQuery
+import org.apache.geronimo.gbean.GBeanInfo
+import org.apache.geronimo.gbean.GBeanData
+import org.apache.geronimo.gbean.GBeanData
+import org.apache.geronimo.kernel.repository.Version
+import org.apache.geronimo.kernel.config.ConfigurationData
+import org.apache.geronimo.kernel.repository.ImportType
+import org.apache.geronimo.kernel.repository.Artifact
+import org.apache.geronimo.kernel.repository.Dependency
+
+
+/**
+ *
+ * @version $Rev:$ $Date:$
+ */
+class ReferenceBuilder {
+    Set references
+    
     ReferenceBuilder() {
-        references = []
    }
   
    def pattern(String pattern) {
        try {
            references.add(new AbstractNameQuery(new URI(pattern)))
        } catch (Exception e) {
            throw new GroovyScriptException('pattern usage: pattern(patternValue)')
        }
    }
 
}
\ No newline at end of file
+        references = []
+    }
+   
+    def pattern(String pattern) {
+        try {
+            references.add(new AbstractNameQuery(new URI(pattern)))
+        } catch (Exception e) {
+            throw new GroovyScriptException('pattern usage: pattern(patternValue)')
+        }
+    }
+ 
+}
\ No newline at end of file

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/ReferenceBuilder.groovy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/java/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/java/org/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/java/org/apache/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/java/org/apache/geronimo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/java/org/apache/geronimo/kernel/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/java/org/apache/geronimo/kernel/config/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/java/org/apache/geronimo/kernel/config/transformer/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/main/resources/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/test/groovy/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/test/groovy/org/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/test/groovy/org/apache/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/test/groovy/org/apache/geronimo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/test/groovy/org/apache/geronimo/kernel/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/test/groovy/org/apache/geronimo/kernel/config/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/test/groovy/org/apache/geronimo/kernel/config/transformer/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/test/java/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 29 00:51:12 2009
@@ -0,0 +1,9 @@
+.*
+*.iws
+*.ipr
+*.iml
+*.log
+junit*.properties
+maven-eclipse.xml
+target
+bin



Mime
View raw message