You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2009/08/29 02:51:37 UTC
svn commit: r809078 [4/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...
Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/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-config-groovy-transformer/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-config-groovy-transformer/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-config-groovy-transformer/src/test/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/test/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/test/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/test/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/resources/configurationDir/
------------------------------------------------------------------------------
--- 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/test/resources/configurationDir/DependenciesTest.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/test/resources/configurationDir/DependenciesTest.groovy?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/test/resources/configurationDir/DependenciesTest.groovy (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/test/resources/configurationDir/DependenciesTest.groovy Sat Aug 29 00:51:12 2009
@@ -1,3 +1,19 @@
+/**
+ * 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.
+ */
import org.apache.geronimo.kernel.repository.ImportType
assert null != configurationData : 'property configurationData is not exported'
Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/test/resources/configurationDir/GBeansTest.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/test/resources/configurationDir/GBeansTest.groovy?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/test/resources/configurationDir/GBeansTest.groovy (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-config-groovy-transformer/src/test/resources/configurationDir/GBeansTest.groovy Sat Aug 29 00:51:12 2009
@@ -1,3 +1,19 @@
+/**
+ * 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.
+ */
import org.apache.geronimo.kernel.config.transformer.DummyGBean
assert null != configurationData : 'property configurationData is not exported'
Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-core/
------------------------------------------------------------------------------
--- 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-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-core/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-core/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-core/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-core</artifactId>
+ <packaging>bundle</packaging>
<name>Geronimo Framework, Modules :: Core</name>
<dependencies>
Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-core/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-core/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-core/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-core/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-core/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-core/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-core/src/main/java/org/apache/geronimo/pool/
------------------------------------------------------------------------------
--- 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-core/src/main/java/org/apache/geronimo/validator/
------------------------------------------------------------------------------
--- 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-core/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-core/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-core/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-core/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-core/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-core/src/test/java/org/apache/geronimo/pool/
------------------------------------------------------------------------------
--- 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-crypto/
------------------------------------------------------------------------------
--- 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-crypto/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-crypto/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-crypto/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-crypto/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-crypto</artifactId>
+ <packaging>bundle</packaging>
<name>Geronimo Framework, Modules :: Crypto</name>
<dependencies>
Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-crypto/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-crypto/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-crypto/src/main/appended-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-crypto/src/main/appended-resources/META-INF/
------------------------------------------------------------------------------
--- 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-crypto/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-crypto/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-crypto/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-crypto/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-crypto/src/main/java/org/apache/geronimo/crypto/
------------------------------------------------------------------------------
--- 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-crypto/src/main/java/org/apache/geronimo/crypto/asn1/
------------------------------------------------------------------------------
--- 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-crypto/src/main/java/org/apache/geronimo/crypto/asn1/cryptopro/
------------------------------------------------------------------------------
--- 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-crypto/src/main/java/org/apache/geronimo/crypto/asn1/misc/
------------------------------------------------------------------------------
--- 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-crypto/src/main/java/org/apache/geronimo/crypto/asn1/oiw/
------------------------------------------------------------------------------
--- 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-crypto/src/main/java/org/apache/geronimo/crypto/asn1/pkcs/
------------------------------------------------------------------------------
--- 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-crypto/src/main/java/org/apache/geronimo/crypto/asn1/sec/
------------------------------------------------------------------------------
--- 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-crypto/src/main/java/org/apache/geronimo/crypto/asn1/util/
------------------------------------------------------------------------------
--- 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-crypto/src/main/java/org/apache/geronimo/crypto/asn1/x509/
------------------------------------------------------------------------------
--- 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-crypto/src/main/java/org/apache/geronimo/crypto/asn1/x9/
------------------------------------------------------------------------------
--- 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-crypto/src/main/java/org/apache/geronimo/crypto/crypto/
------------------------------------------------------------------------------
--- 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-crypto/src/main/java/org/apache/geronimo/crypto/crypto/digests/
------------------------------------------------------------------------------
--- 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-crypto/src/main/java/org/apache/geronimo/crypto/crypto/modes/
------------------------------------------------------------------------------
--- 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-crypto/src/main/java/org/apache/geronimo/crypto/crypto/params/
------------------------------------------------------------------------------
--- 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-crypto/src/main/java/org/apache/geronimo/crypto/encoders/
------------------------------------------------------------------------------
--- 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-crypto/src/main/java/org/apache/geronimo/crypto/jce/
------------------------------------------------------------------------------
--- 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-crypto/src/main/java/org/apache/geronimo/crypto/jce/interfaces/
------------------------------------------------------------------------------
--- 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-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/
------------------------------------------------------------------------------
--- 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-crypto/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-crypto/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-crypto/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-crypto/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-crypto/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-crypto/src/test/java/org/apache/geronimo/crypto/
------------------------------------------------------------------------------
--- 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-deploy-config/
------------------------------------------------------------------------------
--- 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-deploy-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-config/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-config/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-config/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-deploy-config</artifactId>
+ <packaging>bundle</packaging>
<name>Geronimo Framework, Modules :: Deploy Config</name>
<description>
Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-config/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-deploy-config/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-deploy-config/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-deploy-config/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-deploy-config/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-deploy-config/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-deploy-config/src/main/java/org/apache/geronimo/deployment/
------------------------------------------------------------------------------
--- 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-deploy-config/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-deploy-config/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-deploy-config/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-deploy-config/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-deploy-config/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-deploy-config/src/test/java/org/apache/geronimo/deployment/
------------------------------------------------------------------------------
--- 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-deploy-jsr88/
------------------------------------------------------------------------------
--- 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
Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88-bootstrapper/
------------------------------------------------------------------------------
--- 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-deploy-jsr88-bootstrapper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml Sat Aug 29 00:51:12 2009
@@ -1,48 +1,49 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- 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: 493181 $ $Date: 2007-01-06 07:32:03 +1100 (Sat, 06 Jan 2007) $ -->
-
-<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-deploy-jsr88-bootstrapper</artifactId>
- <name>Geronimo Framework, Modules :: Deploy JSR-88 Bootstrapper</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
- </dependency>
- </dependencies>
-
-</project>
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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: 493181 $ $Date: 2007-01-06 07:32:03 +1100 (Sat, 06 Jan 2007) $ -->
+
+<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-deploy-jsr88-bootstrapper</artifactId>
+ <packaging>bundle</packaging>
+ <name>Geronimo Framework, Modules :: Deploy JSR-88 Bootstrapper</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
+
Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88-bootstrapper/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-deploy-jsr88-bootstrapper/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-deploy-jsr88-bootstrapper/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-deploy-jsr88-bootstrapper/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-deploy-jsr88-bootstrapper/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-deploy-jsr88-bootstrapper/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-deploy-jsr88-bootstrapper/src/main/java/org/apache/geronimo/deployment/
------------------------------------------------------------------------------
--- 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-deploy-jsr88-bootstrapper/src/main/java/org/apache/geronimo/deployment/plugin/
------------------------------------------------------------------------------
--- 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-deploy-jsr88-bootstrapper/src/main/java/org/apache/geronimo/deployment/plugin/factories/
------------------------------------------------------------------------------
--- 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-deploy-jsr88-bootstrapper/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryBootstrapper.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88-bootstrapper/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryBootstrapper.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88-bootstrapper/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryBootstrapper.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88-bootstrapper/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryBootstrapper.java Sat Aug 29 00:51:12 2009
@@ -23,6 +23,7 @@
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.util.MainBootstrapper;
+import org.osgi.framework.BundleContext;
/**
*
@@ -64,12 +65,12 @@
}
protected Kernel newKernel() throws DeploymentManagerCreationException {
- ClassLoader classLoader = DeploymentFactoryBootstrapper.class.getClassLoader();
-
+// ClassLoader classLoader = DeploymentFactoryBootstrapper.class.getClassLoader();
+ BundleContext bundleContext = null;
MainBootstrapper bootstrapper = new MainBootstrapper();
try {
- bootstrapper.bootKernel();
- bootstrapper.loadBootConfiguration(classLoader);
+ bootstrapper.bootKernel(bundleContext);
+ bootstrapper.loadBootConfiguration(bundleContext);
bootstrapper.loadPersistentConfigurations();
} catch (Exception e) {
throw (DeploymentManagerCreationException) new DeploymentManagerCreationException("See nested").initCause(e);
Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88-bootstrapper/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-deploy-jsr88-bootstrapper/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
Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/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-deploy-jsr88</artifactId>
+ <packaging>bundle</packaging>
<name>Geronimo Framework, Modules :: Deploy JSR-88</name>
<dependencies>
Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/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-deploy-jsr88/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-deploy-jsr88/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-deploy-jsr88/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-deploy-jsr88/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-deploy-jsr88/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-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/
------------------------------------------------------------------------------
--- 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-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/
------------------------------------------------------------------------------
--- 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-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java Sat Aug 29 00:51:12 2009
@@ -232,19 +232,6 @@
}
}
- /**
- * Try to determine whether a file is a JAR File (or, at least, a ZIP file).
- *
- * @deprecated See org.apache.geronimo.common.FileUtils.isJarFile
- */
- public static boolean isJarFile(File file) throws DeploymentException {
- try {
- return FileUtils.isZipFile(file);
- } catch (IOException e) {
- throw new DeploymentException("Unable to read file "+file.getAbsolutePath(), e);
- }
- }
-
private static class ConfigIdHandler extends DefaultHandler {
private String configId;
private boolean inConfigId;
Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/
------------------------------------------------------------------------------
--- 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-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/
------------------------------------------------------------------------------
--- 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-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/
------------------------------------------------------------------------------
--- 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-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/remote/
------------------------------------------------------------------------------
--- 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-deploy-jsr88/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-deploy-jsr88/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-deploy-jsr88/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-deploy-jsr88/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-deploy-jsr88/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-deploy-jsr88/src/test/java/org/apache/geronimo/deployment/
------------------------------------------------------------------------------
--- 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-deploy-jsr88/src/test/java/org/apache/geronimo/deployment/plugin/
------------------------------------------------------------------------------
--- 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-deploy-tool/
------------------------------------------------------------------------------
--- 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-deploy-tool/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/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-deploy-tool</artifactId>
+ <packaging>bundle</packaging>
<name>Geronimo Framework, Modules :: Deploy Tool</name>
<dependencies>
Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/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-deploy-tool/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-deploy-tool/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-deploy-tool/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-deploy-tool/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-deploy-tool/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-deploy-tool/src/main/java/org/apache/geronimo/deployment/
------------------------------------------------------------------------------
--- 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-deploy-tool/src/main/java/org/apache/geronimo/deployment/PluginBootstrap2.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/PluginBootstrap2.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/PluginBootstrap2.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/PluginBootstrap2.java Sat Aug 29 00:51:12 2009
@@ -37,8 +37,10 @@
import org.apache.geronimo.kernel.repository.DefaultArtifactManager;
import org.apache.geronimo.kernel.repository.ArtifactResolver;
import org.apache.geronimo.kernel.repository.DefaultArtifactResolver;
+import org.apache.geronimo.kernel.repository.Repository;
import org.apache.geronimo.system.configuration.ExecutableConfigurationUtil;
import org.apache.geronimo.system.repository.Maven2Repository;
+import org.osgi.framework.BundleContext;
/**
* @version $Rev$ $Date$
@@ -49,6 +51,7 @@
private File buildDir;
private File carFile;
private boolean expanded;
+ private BundleContext bundleContext;
public void setLocalRepo(File localRepo) {
this.localRepo = localRepo;
@@ -70,6 +73,10 @@
this.expanded = expanded;
}
+ public void setBundleContext(BundleContext bundleContext) {
+ this.bundleContext = bundleContext;
+ }
+
public void bootstrap() throws Exception {
System.out.println("Packaging module configuration: " + plan);
@@ -77,7 +84,7 @@
Maven2Repository repository = new Maven2Repository(localRepo);
GBeanBuilder gBeanBuilder = new GBeanBuilder(null, null);
- ServiceConfigBuilder builder = new ServiceConfigBuilder(null, Collections.singleton(repository), Collections.<NamespaceDrivenBuilder>singleton(gBeanBuilder), new Jsr77Naming());
+ ServiceConfigBuilder builder = new ServiceConfigBuilder(null, Collections.<Repository>singleton(repository), Collections.<NamespaceDrivenBuilder>singleton(gBeanBuilder), new Jsr77Naming(), bundleContext);
ConfigurationStore targetConfigurationStore = new NullConfigurationStore() {
public File createNewConfigurationDir(Artifact configId) throws ConfigurationAlreadyExistsException {
return buildDir;
Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/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-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandDistribute.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandDistribute.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandDistribute.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandDistribute.java Sat Aug 29 00:51:12 2009
@@ -18,7 +18,6 @@
package org.apache.geronimo.deployment.cli;
import java.io.File;
-import java.io.PrintWriter;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
@@ -29,11 +28,12 @@
import javax.enterprise.deploy.spi.TargetModuleID;
import javax.enterprise.deploy.spi.status.ProgressObject;
+import jline.ConsoleReader;
import org.apache.geronimo.cli.deployer.CommandArgs;
import org.apache.geronimo.cli.deployer.DistributeCommandArgs;
import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.common.FileUtils;
import org.apache.geronimo.deployment.plugin.jmx.JMXDeploymentManager;
-import jline.ConsoleReader;
/**
* The CLI deployer logic to distribute.
@@ -70,47 +70,55 @@
throw new DeploymentSyntaxException("CommandArgs has the type [" + commandArgs.getClass() + "]; expected [" + DistributeCommandArgs.class + "]");
}
DistributeCommandArgs distributeCommandArgs = (DistributeCommandArgs) commandArgs;
-
+
BooleanHolder inPlaceHolder = new BooleanHolder();
inPlaceHolder.inPlace = distributeCommandArgs.isInPlace();
-
+
List<String> targets = Arrays.asList(distributeCommandArgs.getTargets());
String[] args = distributeCommandArgs.getArgs();
File module = null;
File plan = null;
- if(args.length > 0) {
+ if (args.length > 0) {
File test = new File(args[0]);
- if(DeployUtils.isJarFile(test) || test.isDirectory()) {
- if(module != null) {
- throw new DeploymentSyntaxException("Module and plan cannot both be JAR files or directories!");
- }
- module = test;
- } else {
- if(plan != null) {
- throw new DeploymentSyntaxException("Module or plan must be a JAR file or directory!");
+ try {
+ if (FileUtils.isJarFile(test) || test.isDirectory()) {
+ if (module != null) {
+ throw new DeploymentSyntaxException("Module and plan cannot both be JAR files or directories!");
+ }
+ module = test;
+ } else {
+ if (plan != null) {
+ throw new DeploymentSyntaxException("Module or plan must be a JAR file or directory!");
+ }
+ plan = test;
}
- plan = test;
+ } catch (IOException e) {
+ throw new DeploymentException("Invalid JAR file " + args[0]);
}
}
- if(args.length > 1) {
+ if (args.length > 1) {
File test = new File(args[1]);
- if(DeployUtils.isJarFile(test) || test.isDirectory()) {
- if(module != null) {
- throw new DeploymentSyntaxException("Module and plan cannot both be JAR files or directories!");
- }
- module = test;
- } else {
- if(plan != null) {
- throw new DeploymentSyntaxException("Module or plan must be a JAR file or directory!");
+ try {
+ if (FileUtils.isJarFile(test) || test.isDirectory()) {
+ if (module != null) {
+ throw new DeploymentSyntaxException("Module and plan cannot both be JAR files or directories!");
+ }
+ module = test;
+ } else {
+ if (plan != null) {
+ throw new DeploymentSyntaxException("Module or plan must be a JAR file or directory!");
+ }
+ plan = test;
}
- plan = test;
+ } catch (IOException e) {
+ throw new DeploymentException("Invalid JAR file " + args[1]);
}
}
- if(module != null) {
+ if (module != null) {
module = module.getAbsoluteFile();
}
- if(plan != null) {
+ if (plan != null) {
plan = plan.getAbsoluteFile();
}
try {
@@ -144,13 +152,13 @@
// print the results that succeeded
results = po.getResultTargetModuleIDs();
- for (int i = 0; i < results.length; i++) {
- TargetModuleID result = results[i];
- out.printString(DeployUtils.reformat(getAction()+" "+result.getModuleID()+(multipleTargets ? " to "+result.getTarget().getName() : "")+(result.getWebURL() == null || !getAction().equals("Deployed") ? "" : " @ "+result.getWebURL()), 4, 72));
- if(result.getChildTargetModuleID() != null) {
+ for (TargetModuleID result : results) {
+ out.printString(DeployUtils.reformat(
+ getAction() + " " + result.getModuleID() + (multipleTargets ? " to " + result.getTarget().getName() : "") + (result.getWebURL() == null || !getAction().equals("Deployed") ? "" : " @ " + result.getWebURL()), 4, 72));
+ if (result.getChildTargetModuleID() != null) {
for (int j = 0; j < result.getChildTargetModuleID().length; j++) {
TargetModuleID child = result.getChildTargetModuleID()[j];
- out.printString(DeployUtils.reformat(" `-> "+child.getModuleID()+(child.getWebURL() == null || !getAction().equals("Deployed") ? "" : " @ "+child.getWebURL()),4, 72));
+ out.printString(DeployUtils.reformat(" `-> " + child.getModuleID() + (child.getWebURL() == null || !getAction().equals("Deployed") ? "" : " @ " + child.getWebURL()), 4, 72));
}
}
}
Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandRedeploy.java Sat Aug 29 00:51:12 2009
@@ -30,6 +30,7 @@
import org.apache.geronimo.cli.deployer.CommandArgs;
import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.common.FileUtils;
import org.apache.geronimo.kernel.repository.Artifact;
import jline.ConsoleReader;
@@ -41,20 +42,20 @@
public class CommandRedeploy extends AbstractCommand {
public void execute(ConsoleReader consoleReader, ServerConnection connection, CommandArgs commandArgs) throws DeploymentException {
- ProgressObject po = null;
+ ProgressObject po;
try {
String[] args = commandArgs.getArgs();
if (args.length == 0) {
throw new DeploymentSyntaxException("Must specify a module or plan (or both) and optionally module IDs to replace");
}
-
+
DeploymentManager mgr = connection.getDeploymentManager();
Target[] allTargets = mgr.getTargets();
TargetModuleID[] allModules;
try {
allModules = mgr.getAvailableModules(null, allTargets);
- } catch(TargetException e) {
+ } catch (TargetException e) {
throw new DeploymentException("Unable to load modules from server", e);
}
@@ -62,78 +63,86 @@
File module = null;
File plan = null;
File test = new File(args[0]); // Guess whether the first argument is a module or a plan
- if(!test.exists()) {
+ if (!test.exists()) {
throw new DeploymentSyntaxException("Module or plan file does not exist: " + test.getAbsolutePath());
}
- if(!test.canRead()) {
- throw new DeploymentException("Cannot read file "+test.getAbsolutePath());
+ if (!test.canRead()) {
+ throw new DeploymentException("Cannot read file " + test.getAbsolutePath());
}
- if(DeployUtils.isJarFile(test) || test.isDirectory()) {
- module = test;
- } else {
- plan = test;
+ try {
+ if (FileUtils.isJarFile(test) || test.isDirectory()) {
+ module = test;
+ } else {
+ plan = test;
+ }
+ } catch (IOException e) {
+ throw new DeploymentException("Invalid JAR File " + args[0]);
}
- if(args.length > 1) { // Guess whether the second argument is a module, plan, ModuleID, or TargetModuleID
+ if (args.length > 1) { // Guess whether the second argument is a module, plan, ModuleID, or TargetModuleID
test = new File(args[1]);
- if(test.exists() && test.canRead() && !args[1].equals(args[0])) {
- if(DeployUtils.isJarFile(test) || test.isDirectory()) {
- if(module != null) {
- throw new DeploymentSyntaxException("Module and plan cannot both be JAR files or directories!");
- }
- module = test;
- } else {
- if(plan != null) {
- throw new DeploymentSyntaxException("Module or plan must be a JAR file or directory!");
+ if (test.exists() && test.canRead() && !args[1].equals(args[0])) {
+ try {
+ if (FileUtils.isJarFile(test) || test.isDirectory()) {
+ if (module != null) {
+ throw new DeploymentSyntaxException("Module and plan cannot both be JAR files or directories!");
+ }
+ module = test;
+ } else {
+ if (plan != null) {
+ throw new DeploymentSyntaxException("Module or plan must be a JAR file or directory!");
+ }
+ plan = test;
}
- plan = test;
+ } catch (IOException e) {
+ throw new DeploymentException("Invalid JAR File " + args[1]);
}
} else {
modules.addAll(DeployUtils.identifyTargetModuleIDs(allModules, args[1], false));
}
}
- for(int i=2; i<args.length; i++) { // Any arguments beyond 2 must be a ModuleID or TargetModuleID
+ for (int i = 2; i < args.length; i++) { // Any arguments beyond 2 must be a ModuleID or TargetModuleID
modules.addAll(DeployUtils.identifyTargetModuleIDs(allModules, args[i], false));
}
// If we don't have any moduleIDs, try to guess one.
- if(modules.size() == 0 && connection.isGeronimo()) {
- emit(consoleReader, "No ModuleID or TargetModuleID provided. Attempting to guess based on the content of the "+(plan == null ? "archive" : "plan")+".");
+ if (modules.size() == 0 && connection.isGeronimo()) {
+ emit(consoleReader, "No ModuleID or TargetModuleID provided. Attempting to guess based on the content of the " + (plan == null ? "archive" : "plan") + ".");
String moduleId = null;
try {
- if(plan != null) {
+ if (plan != null) {
moduleId = DeployUtils.extractModuleIdFromPlan(plan);
- if(moduleId == null) { // plan just doesn't have a config ID
+ if (moduleId == null) { // plan just doesn't have a config ID
String fileName = module == null ? plan.getName() : module.getName();
int pos = fileName.lastIndexOf('.');
String artifactId = pos > -1 ? module.getName().substring(0, pos) : module.getName();
- moduleId = Artifact.DEFAULT_GROUP_ID+"/"+artifactId+"//";
+ moduleId = Artifact.DEFAULT_GROUP_ID + "/" + artifactId + "//";
emit(consoleReader, "Unable to locate Geronimo deployment plan in archive. Calculating default ModuleID from archive name.");
}
- } else if(module != null) {
+ } else if (module != null) {
moduleId = DeployUtils.extractModuleIdFromArchive(module);
- if(moduleId == null) {
+ if (moduleId == null) {
int pos = module.getName().lastIndexOf('.');
String artifactId = pos > -1 ? module.getName().substring(0, pos) : module.getName();
- moduleId = Artifact.DEFAULT_GROUP_ID+"/"+artifactId+"//";
+ moduleId = Artifact.DEFAULT_GROUP_ID + "/" + artifactId + "//";
emit(consoleReader, "Unable to locate Geronimo deployment plan in archive. Calculating default ModuleID from archive name.");
}
}
} catch (IOException e) {
- throw new DeploymentException("Unable to read input files: "+e.getMessage(), e);
+ throw new DeploymentException("Unable to read input files: " + e.getMessage(), e);
}
- if(moduleId != null) {
- emit(consoleReader, "Attempting to use ModuleID '"+moduleId+"'");
+ if (moduleId != null) {
+ emit(consoleReader, "Attempting to use ModuleID '" + moduleId + "'");
modules.addAll(DeployUtils.identifyTargetModuleIDs(allModules, moduleId, true));
} else {
emit(consoleReader, "Unable to calculate a ModuleID from supplied module and/or plan.");
}
}
- if(modules.size() == 0) { // Either not deploying to Geronimo or unable to identify modules
+ if (modules.size() == 0) { // Either not deploying to Geronimo or unable to identify modules
throw new DeploymentSyntaxException("No ModuleID or TargetModuleID available. Nothing to do. Maybe you should add a ModuleID or TargetModuleID to the command line?");
}
- if(module != null) {
+ if (module != null) {
module = module.getAbsoluteFile();
}
- if(plan != null) {
+ if (plan != null) {
plan = plan.getAbsoluteFile();
}
// Now that we've sorted out all the arguments, do the work
@@ -142,21 +151,20 @@
po = mgr.redeploy(ids, module, plan);
waitForProgress(consoleReader, po);
TargetModuleID[] done = po.getResultTargetModuleIDs();
- for(int i = 0; i < done.length; i++) {
- TargetModuleID id = done[i];
- emit(consoleReader, "Redeployed "+id.getModuleID()+(multiple ? " on "+id.getTarget().getName() : "")+(id.getWebURL() == null ? "" : " @ "+id.getWebURL()));
- if(id.getChildTargetModuleID() != null) {
+ for (TargetModuleID id : done) {
+ emit(consoleReader, "Redeployed " + id.getModuleID() + (multiple ? " on " + id.getTarget().getName() : "") + (id.getWebURL() == null ? "" : " @ " + id.getWebURL()));
+ if (id.getChildTargetModuleID() != null) {
for (int j = 0; j < id.getChildTargetModuleID().length; j++) {
TargetModuleID child = id.getChildTargetModuleID()[j];
- emit(consoleReader, " `-> "+child.getModuleID()+(child.getWebURL() == null ? "" : " @ "+child.getWebURL()));
+ emit(consoleReader, " `-> " + child.getModuleID() + (child.getWebURL() == null ? "" : " @ " + child.getWebURL()));
}
}
}
} catch (IOException e) {
throw new DeploymentException("Could not write to console", e);
}
- if(po.getDeploymentStatus().isFailed()) {
- throw new DeploymentException("Operation failed: "+po.getDeploymentStatus().getMessage());
+ if (po.getDeploymentStatus().isFailed()) {
+ throw new DeploymentException("Operation failed: " + po.getDeploymentStatus().getMessage());
}
}
Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/DeployTool.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/DeployTool.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/DeployTool.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/DeployTool.java Sat Aug 29 00:51:12 2009
@@ -54,6 +54,9 @@
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.util.Main;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import jline.ConsoleReader;
@@ -72,6 +75,7 @@
public class DeployTool implements Main {
private static final IdentityHashMap<CommandMetaData, DeployCommand> commands = new IdentityHashMap<CommandMetaData, DeployCommand>();
+ private static final Logger log = LoggerFactory.getLogger(DeployTool.class);
static {
commands.put(LoginCommandMetaData.META_DATA, new CommandLogin());
@@ -208,11 +212,8 @@
}
private void processException(PrintWriter out, Exception e) {
- failed = true;
- out.print(DeployUtils.reformat("Error: "+e.getMessage(),4,72));
- if(e.getCause() != null) {
- e.getCause().printStackTrace(out);
- }
+ failed = true;
+ log.error("Error: ", e);
}
public static final GBeanInfo GBEAN_INFO;
Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/DeployUtils.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/DeployUtils.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/DeployUtils.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/DeployUtils.java Sat Aug 29 00:51:12 2009
@@ -49,13 +49,18 @@
*
* @param source The unformatted String
* @param indent The number of characters to indent on the left
- * @param endCol The maximum width of the entire line in characters,
+ * @param width The maximum width of the entire line in characters,
* including indent (indent 10 with endCol 70 results
* in 60 "usable" characters).
*/
- 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);
@@ -95,7 +100,7 @@
return buf.toString();
}
- private final static int DEFAULT_TERM_WIDTH = 256;
+ private final static int DEFAULT_WIDTH = 76;
public static void println(String line, int indent, ConsoleReader consoleReader) throws IOException {
int endCol = consoleReader.getTermwidth();
@@ -104,11 +109,12 @@
// some terminals will give a terminal width of zero (e.g. emacs shell).
// in that case, default to a reasonable term width value.
if (endCol == 0) {
- endCol = DEFAULT_TERM_WIDTH;
+ 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);
}
String prefix = indent == 0 ? "" : buildIndent(indent);
int pos;
Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/ServerConnection.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/ServerConnection.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/ServerConnection.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/ServerConnection.java Sat Aug 29 00:51:12 2009
@@ -31,6 +31,7 @@
import org.apache.geronimo.cli.deployer.ConnectionParams;
import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.common.FileUtils;
import org.apache.geronimo.deployment.cli.DeployUtils.SavedAuthentication;
import org.apache.geronimo.deployment.plugin.factories.AuthenticationFailedException;
import org.apache.geronimo.deployment.plugin.jmx.JMXDeploymentManager;
@@ -171,8 +172,12 @@
private void loadDriver(String driver, DeploymentFactoryManager mgr) throws DeploymentException {
File file = new File(driver);
- if (!file.exists() || !file.canRead() || !DeployUtils.isJarFile(file)) {
- throw new DeploymentSyntaxException("Driver '" + file.getAbsolutePath() + "' is not a readable JAR file");
+ try {
+ if (!file.exists() || !file.canRead() || !FileUtils.isJarFile(file)) {
+ throw new DeploymentSyntaxException("Driver '" + file.getAbsolutePath() + "' is not a readable JAR file");
+ }
+ } catch (IOException e) {
+ throw new DeploymentException("Driver '" + file.getAbsolutePath() + "' is not a readable JAR file");
}
String className = null;
try {
Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/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-deploy-tool/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-deploy-tool/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-deploy-tool/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-deploy-tool/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-deploy-tool/src/test/java/org/apache/geronimo/deployment/
------------------------------------------------------------------------------
--- 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-deployment/
------------------------------------------------------------------------------
--- 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-deployment/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/pom.xml?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/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-deployment</artifactId>
+ <packaging>bundle</packaging>
<name>Geronimo Framework, Modules :: Deployment</name>
<dependencies>
Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/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-deployment/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-deployment/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-deployment/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-deployment/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-deployment/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-deployment/src/main/java/org/apache/geronimo/deployment/
------------------------------------------------------------------------------
--- 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-deployment/src/main/java/org/apache/geronimo/deployment/ConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/ConfigurationBuilder.java?rev=809078&r1=809077&r2=809078&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/ConfigurationBuilder.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/ConfigurationBuilder.java Sat Aug 29 00:51:12 2009
@@ -68,5 +68,5 @@
* @throws IOException if there was a problem reading or writing the files
* @throws org.apache.geronimo.common.DeploymentException if there was a problem with the configuration
*/
- DeploymentContext buildConfiguration(boolean inPlaceDeployment, Artifact configId, Object plan, JarFile module, Collection configurationStores, ArtifactResolver artifactResolver, ConfigurationStore targetConfigurationStore) throws IOException, DeploymentException;
+ DeploymentContext buildConfiguration(boolean inPlaceDeployment, Artifact configId, Object plan, JarFile module, Collection<ConfigurationStore> configurationStores, ArtifactResolver artifactResolver, ConfigurationStore targetConfigurationStore) throws IOException, DeploymentException;
}