servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r966290 - in /servicemix/smx4/features/trunk: ./ assembly/ assembly/src/main/descriptors/ assembly/src/main/distribution/text/etc/ assembly/src/main/distribution/unix-shell/bin/ assembly/src/main/filtered-resources/ assembly/src/main/filter...
Date Wed, 21 Jul 2010 16:05:10 GMT
Author: gnodet
Date: Wed Jul 21 16:05:09 2010
New Revision: 966290

URL: http://svn.apache.org/viewvc?rev=966290&view=rev
Log:
Use war deployer from karaf, fix branding and distribution

Added:
    servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.aries.transaction.cfg
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/custom.properties
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/jre.properties
    servicemix/smx4/features/trunk/branding/src/main/resources/org/apache/karaf/
      - copied from r966101, servicemix/smx4/features/trunk/branding/src/main/resources/org/apache/felix/karaf/
Removed:
    servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.transaction.cfg
    servicemix/smx4/features/trunk/assembly/src/main/distribution/unix-shell/bin/
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/config.properties
    servicemix/smx4/features/trunk/branding/src/main/resources/org/apache/felix/karaf/
    servicemix/smx4/features/trunk/war/
Modified:
    servicemix/smx4/features/trunk/assembly/pom.xml
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
    servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/system.properties
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/ode-features.xml
    servicemix/smx4/features/trunk/branding/src/main/resources/org/apache/karaf/branding/branding.properties
    servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml
    servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml
    servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
    servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
    servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
    servicemix/smx4/features/trunk/pom.xml

Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=966290&r1=966289&r2=966290&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Wed Jul 21 16:05:09 2010
@@ -461,7 +461,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <artifactId>geronimo-annotation_1.1_spec</artifactId>
             <version>${geronimo.annotation.version}</version>
         </dependency>
         <dependency>
@@ -499,11 +499,6 @@
             <artifactId>org.apache.servicemix.cxf.transport.nmr</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.war</groupId>
-            <artifactId>org.apache.servicemix.war.deployer</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <!--
         <dependency>
             <groupId>org.apache.openejb</groupId>
@@ -1011,10 +1006,11 @@
                             </descriptors>
                             <features>
                                 <feature>jbi-cluster</feature>
-                                <feature>web</feature>
+                                <feature>war</feature>
                                 <feature>cxf-nmr</feature>
                                 <feature>cxf-osgi</feature>
-                                <feature>camel-activemq</feature>  
+                                <feature>camel-blueprint</feature>  
+                                <feature>camel-activemq</feature>
 								<feature>activemq-broker</feature>
                                 <!-- ServiceMix components -->
                                 <feature>servicemix-cxf-bc</feature>

Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=966290&r1=966289&r2=966290&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml Wed Jul 21 16:05:09 2010
@@ -29,12 +29,13 @@
             <outputDirectory>/</outputDirectory>
             <excludes>
               <exclude>**/demos/**</exclude>
-              <exclude>bin/start</exclude>
+              <exclude>bin/**</exclude>
               <exclude>etc/system.properties</exclude>
               <exclude>etc/org.apache.karaf.features.cfg</exclude>
               <exclude>etc/org.ops4j.pax.logging.cfg</exclude>
               <exclude>etc/users.properties</exclude>
-              <exclude>etc/config.properties</exclude>
+              <exclude>etc/custom.properties</exclude>
+              <exclude>etc/jre.properties</exclude>
               <exclude>LICENSE</exclude>
               <exclude>NOTICE</exclude>
               <exclude>README</exclude>
@@ -53,7 +54,7 @@
             <fileMode>0755</fileMode>
         </fileSet>
 
-        <!-- Copy over kernel demo to examples folder -->
+        <!-- Copy over karaf demo to examples folder -->
         <fileSet>
             <directory>target/dependencies/unix/apache-karaf-${karaf.version}/demos</directory>
             <outputDirectory>/examples/karaf-demos</outputDirectory>
@@ -162,6 +163,20 @@
             <lineEnding>unix</lineEnding>
         </file>
         <file>
+            <source>${basedir}/target/classes/bin/start</source>
+            <outputDirectory>/bin/</outputDirectory>
+            <destName>start</destName>
+            <fileMode>0755</fileMode>
+            <lineEnding>unix</lineEnding>
+        </file>
+        <file>
+            <source>${basedir}/target/classes/bin/stop</source>
+            <outputDirectory>/bin/</outputDirectory>
+            <destName>stop</destName>
+            <fileMode>0755</fileMode>
+            <lineEnding>unix</lineEnding>
+        </file>
+        <file>
             <source>${basedir}/target/dependencies/servicemix-version.jar</source>
             <outputDirectory>/lib/</outputDirectory>
             <fileMode>0644</fileMode>
@@ -385,7 +400,7 @@
             <outputFileNameMapping>org/apache/geronimo/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <includes>
                 <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
-                <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-annotation_1.1_spec</include>
             </includes>
         </dependencySet>
         <dependencySet>

Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=966290&r1=966289&r2=966290&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml Wed Jul 21 16:05:09 2010
@@ -375,7 +375,7 @@
             <outputFileNameMapping>org/apache/geronimo/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <includes>
                 <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
-                <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-annotation_1.1_spec</include>
             </includes>
         </dependencySet>
         <dependencySet>

Added: servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.aries.transaction.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.aries.transaction.cfg?rev=966290&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.aries.transaction.cfg (added)
+++ servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.aries.transaction.cfg Wed Jul 21 16:05:09 2010
@@ -0,0 +1,21 @@
+#
+# 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.
+#
+#
+aries.transaction.timeout=600
+aries.transaction.howl.logFileDir=${karaf.data}/txlog/

Modified: servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/system.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/system.properties?rev=966290&r1=966289&r2=966290&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/system.properties (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/system.properties Wed Jul 21 16:05:09 2010
@@ -17,15 +17,55 @@
 #
 ################################################################################
 
+#
+# The properties defined in this file will be made available through system
+# properties at the very beginning of the Karaf's boot process.
+#
+
+
+# Log level when the pax-logging service is not available
+# This level will only be used while the pax-logging service bundle
+# is not fully available.
+# To change log levels, please refer to the org.ops4j.pax.logging.cfg file
+# instead.
 org.ops4j.pax.logging.DefaultServiceLog.level=ERROR
+
+#
+# Name of this karaf instance.
+#
 karaf.name=root
+
+#
+# Default repository where bundles will be loaded from before using
+# other maven repositories.  For the full maven configuration, see
+# the org.ops4j.pax.url.mvn.cfg file.
+#
 karaf.default.repository=system
+
+#
+# Location of a shell script that will be run when starting a shell
+# session.  This script can be used to create aliases and define
+# additional commands.
+#
+karaf.shell.init.script=${karaf.home}/etc/shell.init.script
+
+#
+# Set this empty property to avoid errors when validating xml documents.
+#
 xml.catalog.files=
+
+#
+# Suppress the bell in the console when hitting backspace to many times
+# for example
+#
+jline.nobell=true
+
+#
 # Default port for the OSGI HTTP Service
+#
 org.osgi.service.http.port=8181
 
-# Configure the default Karaf init script location
-karaf.shell.init.script=${karaf.home}/etc/shell.init.script
-
+#
 # Allow usage of ${servicemix.home} as an alias for ${karaf.home}
+#
 servicemix.home=${karaf.home}

Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml?rev=966290&r1=966289&r2=966290&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml Wed Jul 21 16:05:09 2010
@@ -17,7 +17,7 @@
 -->
 
 <features>
-  <repository>mvn:org.apache.karaf/apache-karaf/1.99.0-SNAPSHOT/xml/features</repository>
+  <repository>mvn:org.apache.karaf/apache-karaf/${karaf.version}/xml/features</repository>
   <feature name='camel' version='${camel.version}'>
      <feature version='${camel.version}'>camel-core</feature>
      <feature version='${camel.version}'>camel-spring</feature>
@@ -31,6 +31,10 @@
     <bundle>mvn:org.fusesource.commonman/commons-management/1.0</bundle>
     <bundle>mvn:org.apache.camel/camel-core/${camel.version}</bundle>
   </feature>
+  <feature name='camel-blueprint' version='${camel.version}'>
+      <feature version='${camel.version}'>camel-core</feature>
+      <bundle>mvn:org.apache.camel/camel-blueprint/${camel.version}</bundle>
+  </feature>
   <feature name='camel-spring' version='${camel.version}'>
     <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
     <feature version='3.0.3.RELEASE'>spring</feature>
@@ -75,7 +79,7 @@
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.neethi/2.0.4_2</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/0.4.0-incubating_3</bundle>
     <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.1/1.4.0</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/1.0</bundle>
     <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/1.4.0</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/1.6.2_2</bundle>
     <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.0/1.4.0</bundle>
@@ -83,7 +87,7 @@
     <bundle>mvn:org.apache.cxf/cxf-bundle/${cxf.version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/1.3.2_3</bundle>
     <feature version='${camel.version}'>camel-spring</feature>
-    <feature version='1.99.0-SNAPSHOT'>http</feature>
+    <feature version='${karaf.version}}'>http</feature>
     <bundle>mvn:org.apache.camel/camel-cxf/${camel.version}</bundle>
   </feature>
   <feature name='camel-cache' version='${camel.version}'>
@@ -118,7 +122,7 @@
     <bundle>mvn:org.apache.camel/camel-mina/${camel.version}</bundle>
   </feature>
   <feature name='camel-jetty' version='${camel.version}'>
-     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/6.1.22_1</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/6.1.22_1</bundle>
     <feature version='${camel.version}'>camel-http</feature>
     <bundle>mvn:org.apache.camel/camel-jetty/${camel.version}</bundle>
   </feature>
@@ -207,7 +211,7 @@
   <feature name='camel-guice' version='${camel.version}'>
     <bundle>mvn:http://guiceyfruit.googlecode.com/svn/repo/releases!org.guiceyfruit/guiceyfruit-core/2.0</bundle>
     <bundle>mvn:http://guiceyfruit.googlecode.com/svn/repo/releases!org.guiceyfruit/guice-all/2.0</bundle>
-    <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/1.0</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/1.0_3</bundle>
     <feature version='${camel.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-guice/${camel.version}</bundle>

Added: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/custom.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/custom.properties?rev=966290&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/custom.properties (added)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/custom.properties Wed Jul 21 16:05:09 2010
@@ -0,0 +1,33 @@
+################################################################################
+#
+#    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.
+#
+################################################################################
+
+#
+# You can place any customized configuration here.
+# All the values specified here will override the default value.
+#
+
+obr.repository.url=http://svn.apache.org/repos/asf/servicemix/smx4/obr-repo/repository.xml
+
+org.osgi.framework.system.packages.extra = \
+  org.apache.karaf.branding; \ 
+  com.sun.org.apache.xalan.internal.xsltc.trax; \
+  com.sun.org.apache.xerces.internal.dom; \
+  com.sun.org.apache.xerces.internal.jaxp; \
+  com.sun.org.apache.xerces.internal.xni; \
+  com.sun.jndi.ldap

Added: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/jre.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/jre.properties?rev=966290&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/jre.properties (added)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/jre.properties Wed Jul 21 16:05:09 2010
@@ -0,0 +1,315 @@
+################################################################################
+#
+#    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.
+#
+################################################################################
+
+#
+# Java platform package export properties.
+#
+
+
+# Standard package set.  Note that:
+#   - javax.transaction* is exported with a mandatory attribute 
+jre-1.5=, \
+ javax.accessibility, \
+ javax.activity, \
+ javax.crypto, \
+ javax.crypto.interfaces, \
+ javax.crypto.spec, \
+ javax.imageio, \
+ javax.imageio.event, \
+ javax.imageio.metadata, \
+ javax.imageio.plugins.bmp, \
+ javax.imageio.plugins.jpeg, \
+ javax.imageio.spi, \
+ javax.imageio.stream, \
+ javax.management, \
+ javax.management.loading, \
+ javax.management.modelmbean, \
+ javax.management.monitor, \
+ javax.management.openmbean, \
+ javax.management.relation, \
+ javax.management.remote, \
+ javax.management.remote.rmi, \
+ javax.management.timer, \
+ javax.naming, \
+ javax.naming.directory, \
+ javax.naming.event, \
+ javax.naming.ldap, \
+ javax.naming.spi, \
+ javax.net, \
+ javax.net.ssl, \
+ javax.print, \
+ javax.print.attribute, \
+ javax.print.attribute.standard, \
+ javax.print.event, \
+ javax.rmi, \
+ javax.rmi.CORBA, \
+ javax.rmi.ssl, \
+ javax.security.auth, \
+ javax.security.auth.callback, \
+ javax.security.auth.kerberos, \
+ javax.security.auth.login, \
+ javax.security.auth.spi, \
+ javax.security.auth.x500, \
+ javax.security.cert, \
+ javax.security.sasl, \
+ javax.sound.midi, \
+ javax.sound.midi.spi, \
+ javax.sound.sampled, \
+ javax.sound.sampled.spi, \
+ javax.sql, \
+ javax.sql.rowset, \
+ javax.sql.rowset.serial, \
+ javax.sql.rowset.spi, \
+ javax.swing, \
+ javax.swing.border, \
+ javax.swing.colorchooser, \
+ javax.swing.event, \
+ javax.swing.filechooser, \
+ javax.swing.plaf, \
+ javax.swing.plaf.basic, \
+ javax.swing.plaf.metal, \
+ javax.swing.plaf.multi, \
+ javax.swing.plaf.synth, \
+ javax.swing.table, \
+ javax.swing.text, \
+ javax.swing.text.html, \
+ javax.swing.text.html.parser, \
+ javax.swing.text.rtf, \
+ javax.swing.tree, \
+ javax.swing.undo, \
+ javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
+ javax.xml, \
+ javax.xml.datatype, \
+ javax.xml.namespace, \
+ javax.xml.parsers, \
+ javax.xml.transform, \
+ javax.xml.transform.dom, \
+ javax.xml.transform.sax, \
+ javax.xml.transform.stream, \
+ javax.xml.validation, \
+ javax.xml.xpath, \
+ org.ietf.jgss, \
+ org.omg.CORBA, \
+ org.omg.CORBA_2_3, \
+ org.omg.CORBA_2_3.portable, \
+ org.omg.CORBA.DynAnyPackage, \
+ org.omg.CORBA.ORBPackage, \
+ org.omg.CORBA.portable, \
+ org.omg.CORBA.TypeCodePackage, \
+ org.omg.CosNaming, \
+ org.omg.CosNaming.NamingContextExtPackage, \
+ org.omg.CosNaming.NamingContextPackage, \
+ org.omg.Dynamic, \
+ org.omg.DynamicAny, \
+ org.omg.DynamicAny.DynAnyFactoryPackage, \
+ org.omg.DynamicAny.DynAnyPackage, \
+ org.omg.IOP, \
+ org.omg.IOP.CodecFactoryPackage, \
+ org.omg.IOP.CodecPackage, \
+ org.omg.Messaging, \
+ org.omg.PortableInterceptor, \
+ org.omg.PortableInterceptor.ORBInitInfoPackage, \
+ org.omg.PortableServer, \
+ org.omg.PortableServer.CurrentPackage, \
+ org.omg.PortableServer.POAManagerPackage, \
+ org.omg.PortableServer.POAPackage, \
+ org.omg.PortableServer.portable, \
+ org.omg.PortableServer.ServantLocatorPackage, \
+ org.omg.SendingContext, \
+ org.omg.stub.java.rmi, \
+ org.omg.stub.javax.management.remote.rmi, \
+ org.w3c.dom, \
+ org.w3c.dom.bootstrap, \
+ org.w3c.dom.css, \
+ org.w3c.dom.events, \
+ org.w3c.dom.html, \
+ org.w3c.dom.ls, \
+ org.w3c.dom.ranges, \
+ org.w3c.dom.stylesheets, \
+ org.w3c.dom.traversal, \
+ org.w3c.dom.views, \
+ org.xml.sax, \
+ org.xml.sax.ext, \
+ org.xml.sax.helpers
+
+# Standard package set.  Note that:
+#   - javax.transaction* is exported with a mandatory attribute 
+#   - javax.activation, javax.annotation*, javax.jws*, javax.script*, javax.xml.bind*, javax.xml.soap, javax.xml.ws* packages are not exported
+jre-1.6=, \
+ com.sun.org.apache.xalan.internal.xsltc.trax, \
+ com.sun.org.apache.xerces.internal.dom, \
+ com.sun.org.apache.xerces.internal.jaxp, \
+ com.sun.org.apache.xerces.internal.xni, \
+ com.sun.jndi.ldap, \
+ javax.accessibility, \
+# javax.activation, \
+ javax.activity, \
+# javax.annotation, \
+# javax.annotation.processing, \
+ javax.crypto, \
+ javax.crypto.interfaces, \
+ javax.crypto.spec, \
+ javax.imageio, \
+ javax.imageio.event, \
+ javax.imageio.metadata, \
+ javax.imageio.plugins.bmp, \
+ javax.imageio.plugins.jpeg, \
+ javax.imageio.spi, \
+ javax.imageio.stream, \
+# javax.jws, \
+# javax.jws.soap, \
+ javax.lang.model, \
+ javax.lang.model.element, \
+ javax.lang.model.type, \
+ javax.lang.model.util, \
+ javax.management, \
+ javax.management.loading, \
+ javax.management.modelmbean, \
+ javax.management.monitor, \
+ javax.management.openmbean, \
+ javax.management.relation, \
+ javax.management.remote, \
+ javax.management.remote.rmi, \
+ javax.management.timer, \
+ javax.naming, \
+ javax.naming.directory, \
+ javax.naming.event, \
+ javax.naming.ldap, \
+ javax.naming.spi, \
+ javax.net, \
+ javax.net.ssl, \
+ javax.print, \
+ javax.print.attribute, \
+ javax.print.attribute.standard, \
+ javax.print.event, \
+ javax.rmi, \
+ javax.rmi.CORBA, \
+ javax.rmi.ssl, \
+ javax.security.auth, \
+ javax.security.auth.callback, \
+ javax.security.auth.kerberos, \
+ javax.security.auth.login, \
+ javax.security.auth.spi, \
+ javax.security.auth.x500, \
+ javax.security.cert, \
+ javax.security.sasl, \
+ javax.sound.midi, \
+ javax.sound.midi.spi, \
+ javax.sound.sampled, \
+ javax.sound.sampled.spi, \
+ javax.sql, \
+ javax.sql.rowset, \
+ javax.sql.rowset.serial, \
+ javax.sql.rowset.spi, \
+ javax.swing, \
+ javax.swing.border, \
+ javax.swing.colorchooser, \
+ javax.swing.event, \
+ javax.swing.filechooser, \
+ javax.swing.plaf, \
+ javax.swing.plaf.basic, \
+ javax.swing.plaf.metal, \
+ javax.swing.plaf.multi, \
+ javax.swing.plaf.synth, \
+ javax.swing.table, \
+ javax.swing.text, \
+ javax.swing.text.html, \
+ javax.swing.text.html.parser, \
+ javax.swing.text.rtf, \
+ javax.swing.tree, \
+ javax.swing.undo, \
+ javax.tools, \
+ javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
+ javax.xml, \
+# javax.xml.bind, \
+# javax.xml.bind.annotation, \
+# javax.xml.bind.annotation.adapters, \
+# javax.xml.bind.attachment, \
+# javax.xml.bind.helpers, \
+# javax.xml.bind.util, \
+ javax.xml.crypto, \
+ javax.xml.crypto.dom, \
+ javax.xml.crypto.dsig, \
+ javax.xml.crypto.dsig.dom, \
+ javax.xml.crypto.dsig.keyinfo, \
+ javax.xml.crypto.dsig.spec, \
+ javax.xml.datatype, \
+ javax.xml.namespace, \
+ javax.xml.parsers, \
+# javax.xml.soap, \
+# javax.xml.stream, \
+# javax.xml.stream.events, \
+# javax.xml.stream.util, \
+ javax.xml.transform, \
+ javax.xml.transform.dom, \
+ javax.xml.transform.sax, \
+ javax.xml.transform.stax, \
+ javax.xml.transform.stream, \
+ javax.xml.validation, \
+# javax.xml.ws, \
+# javax.xml.ws.handler, \
+# javax.xml.ws.handler.soap, \
+# javax.xml.ws.http, \
+# javax.xml.ws.soap, \
+# javax.xml.ws.spi, \
+ javax.xml.xpath, \
+ org.ietf.jgss, \
+ org.omg.CORBA, \
+ org.omg.CORBA_2_3, \
+ org.omg.CORBA_2_3.portable, \
+ org.omg.CORBA.DynAnyPackage, \
+ org.omg.CORBA.ORBPackage, \
+ org.omg.CORBA.portable, \
+ org.omg.CORBA.TypeCodePackage, \
+ org.omg.CosNaming, \
+ org.omg.CosNaming.NamingContextExtPackage, \
+ org.omg.CosNaming.NamingContextPackage, \
+ org.omg.Dynamic, \
+ org.omg.DynamicAny, \
+ org.omg.DynamicAny.DynAnyFactoryPackage, \
+ org.omg.DynamicAny.DynAnyPackage, \
+ org.omg.IOP, \
+ org.omg.IOP.CodecFactoryPackage, \
+ org.omg.IOP.CodecPackage, \
+ org.omg.Messaging, \
+ org.omg.PortableInterceptor, \
+ org.omg.PortableInterceptor.ORBInitInfoPackage, \
+ org.omg.PortableServer, \
+ org.omg.PortableServer.CurrentPackage, \
+ org.omg.PortableServer.POAManagerPackage, \
+ org.omg.PortableServer.POAPackage, \
+ org.omg.PortableServer.portable, \
+ org.omg.PortableServer.ServantLocatorPackage, \
+ org.omg.SendingContext, \
+ org.omg.stub.java.rmi, \
+ org.omg.stub.javax.management.remote.rmi, \
+ org.w3c.dom, \
+ org.w3c.dom.bootstrap, \
+ org.w3c.dom.css, \
+ org.w3c.dom.events, \
+ org.w3c.dom.html, \
+ org.w3c.dom.ls, \
+ org.w3c.dom.ranges, \
+ org.w3c.dom.stylesheets, \
+ org.w3c.dom.traversal, \
+ org.w3c.dom.views, \
+ org.w3c.dom.xpath, \
+ org.xml.sax, \
+ org.xml.sax.ext, \
+ org.xml.sax.helpers

Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg?rev=966290&r1=966289&r2=966290&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg Wed Jul 21 16:05:09 2010
@@ -19,15 +19,29 @@
 
 # Root logger
 log4j.rootLogger=INFO, out, osgi:VmLogAppender
+log4j.throwableRenderer=org.apache.log4j.OsgiThrowableRenderer
 
 # CONSOLE appender not used by default
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n
+log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
 
 # File appender
-log4j.appender.out=org.apache.log4j.FileAppender
+log4j.appender.out=org.apache.log4j.RollingFileAppender
 log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n
-log4j.appender.out.file=${karaf.base}/data/log/servicemix.log
-log4j.appender.out.append=true
\ No newline at end of file
+log4j.appender.out.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
+log4j.appender.out.file=${karaf.data}/log/servicemix.log
+log4j.appender.out.append=true
+log4j.appender.out.maxFileSize=1MB
+log4j.appender.out.maxBackupIndex=10
+
+# Sift appender
+log4j.appender.sift=org.apache.log4j.sift.MDCSiftingAppender
+log4j.appender.sift.key=bundle.name
+log4j.appender.sift.default=servicemix
+log4j.appender.sift.appender=org.apache.log4j.FileAppender
+log4j.appender.sift.appender.layout=org.apache.log4j.PatternLayout
+log4j.appender.sift.appender.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n
+log4j.appender.sift.appender.file=${karaf.data}/log/$\\{bundle.name\\}.log
+log4j.appender.sift.appender.append=true
+

Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=966290&r1=966289&r2=966290&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml Wed Jul 21 16:05:09 2010
@@ -31,21 +31,10 @@
         <bundle>mvn:org.springframework/spring-aop/${spring.version}</bundle>
         <!--bundle>mvn:org.jencks/jencks/${jencks.version}</bundle-->
     </feature>
-    <feature name="web-core" version="${version}">
-        <feature version="${karaf.version}">http</feature>
-        <bundle>mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
-    </feature>
-    <feature name="web" version="${version}">
-        <feature version="${version}">web-core</feature>
-        <bundle>mvn:org.ops4j.pax.web/pax-web-extender-war/${pax.web.version}</bundle>
-        <bundle>mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/${pax.web.version}</bundle>
-        <bundle>mvn:org.ops4j.pax.url/pax-url-war/${pax.url.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.war/org.apache.servicemix.war.deployer/${version}</bundle>
-    </feature>
     <feature name="cxf" version="${cxf.version}">
 		<feature>transaction</feature>
         <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo.annotation.version}</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo.annotation.version}</bundle>
         <bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo.wsmetadata.version}</bundle>
         <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
         <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}/${servicemix.specs.version}</bundle>
@@ -85,8 +74,7 @@
     </feature>
     <feature name="cxf-osgi" version="${version}">
         <feature version="${cxf.version}">cxf</feature>
-        <feature version="${version}">web-core</feature>
-        <bundle>mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/${pax.web.version}</bundle>
+        <feature version="${karaf.version}">war</feature>
     </feature>
     <feature name="cxf-jaxrs" version="${version}">
         <feature version="${version}">cxf-osgi</feature>
@@ -246,7 +234,7 @@
     </feature>
     <feature name="servicemix-bean" version="${servicemix-bean-version}">
         <feature version="${servicemix-shared-version}">servicemix-shared</feature>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo.annotation.version}</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo.annotation.version}</bundle>
         <bundle>mvn:org.apache.servicemix/servicemix-bean/${servicemix-bean-version}</bundle>
     </feature>
     <feature name="servicemix-camel" version="${servicemix-camel-version}">

Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/ode-features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/ode-features.xml?rev=966290&r1=966289&r2=966290&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/ode-features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/ode-features.xml Wed Jul 21 16:05:09 2010
@@ -17,38 +17,39 @@
      limitations under the License.
   -->
 <features>
-	<feature name="openjpa" version="${openjpa.version}">
-		<feature>transaction</feature>
-		<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/1.0</bundle>
-    	<bundle>mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/1.1</bundle>
-    	<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp.version}</bundle>
-    	<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang-version}</bundle>
-    	<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.version}</bundle>
-    	<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.version}</bundle>
-    	<bundle>mvn:org.apache.openjpa/openjpa/${openjpa.version}</bundle>
-		<bundle>mvn:org.apache.aries/org.apache.aries.util${aries.util.version}</bundle>
-		<bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.api/${aries.jpa.version}</bundle>
-		<bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.container/${aries.jpa.version}</bundle>
-		<bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.container.context/${aries.jpa.version}</bundle>
-		<bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.blueprint.aries/${aries.jpa.version}</bundle>
-	</feature> 
+    <feature name="openjpa" version="${openjpa.version}">
+        <feature>transaction</feature>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/1.0</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/1.1</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang-version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.openjpa/2.0.0_1-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
+        <bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.api/${aries.jpa.version}</bundle>
+        <bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.container/${aries.jpa.version}</bundle>
+        <bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.container.context/${aries.jpa.version}</bundle>
+        <bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.blueprint.aries/${aries.jpa.version}</bundle>
+    </feature>
     <feature name="ode" version="${ode.version}">
-    	<feature>transaction</feature>
-    	<feature>spring-dm</feature>
-		<feature>jbi</feature>
-		<bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo.j2ee.connector.version}</bundle>
-		<bundle>mvn:org.apache.geronimo.components/geronimo-connector/${geronimo.connector.version}</bundle>
-    	<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.version}</bundle>
-    	<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils.version}</bundle>
-    	<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.version}</bundle>
-    	<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec.version}</bundle>
-    	<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.version}</bundle>
-    	<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang-version}</bundle>
-    	<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxen/${jaxen.version}</bundle>
-    	<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon.version}</bundle>
-    	<bundle>mvn:org.tranql/tranql-connector${tranql.version}</bundle>
-    	<bundle>mvn:org.apache.derby/derby/${derby.version}</bundle>
-    	<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans.version}</bundle>
-    	<bundle>mvn:org.apache.ode/ode-jbi-bundle/${ode.version}</bundle>
+        <feature>transaction</feature>
+        <feature>spring-dm</feature>
+        <feature>jbi</feature>
+        <feature version="${openjpa.version}">openjpa</feature>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo.j2ee.connector.version}</bundle>
+        <bundle>mvn:org.apache.geronimo.components/geronimo-connector/${geronimo.connector.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang-version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxen/${jaxen.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon.version}</bundle>
+        <bundle>mvn:org.tranql/tranql-connector/${tranql.version}</bundle>
+        <bundle>mvn:org.apache.derby/derby/${derby.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans.version}</bundle>
+        <bundle>mvn:org.apache.ode/ode-jbi-bundle/${ode.version}</bundle>
     </feature>
 </features>

Modified: servicemix/smx4/features/trunk/branding/src/main/resources/org/apache/karaf/branding/branding.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/branding/src/main/resources/org/apache/karaf/branding/branding.properties?rev=966290&r1=966101&r2=966290&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/branding/src/main/resources/org/apache/karaf/branding/branding.properties (original)
+++ servicemix/smx4/features/trunk/branding/src/main/resources/org/apache/karaf/branding/branding.properties Wed Jul 21 16:05:09 2010
@@ -28,4 +28,5 @@ welcome = \
 \n\
 Hit '\u001B[1m<tab>\u001B[0m' for a list of available commands\n\
    and '\u001B[1m[cmd] --help\u001B[0m' for help on a specific command.\n
+Hit '<ctrl-d>' or 'osgi:shutdown' to shutdown ServiceMix.\n
 

Modified: servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml?rev=966290&r1=966289&r2=966290&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml Wed Jul 21 16:05:09 2010
@@ -62,7 +62,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <artifactId>geronimo-annotation_1.1_spec</artifactId>
             <version>${geronimo.annotation.version}</version>
         </dependency>
         <dependency>

Modified: servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml?rev=966290&r1=966289&r2=966290&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml Wed Jul 21 16:05:09 2010
@@ -50,7 +50,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <artifactId>geronimo-annotation_1.1_spec</artifactId>
             <version>${geronimo.annotation.version}</version>
         </dependency>
         <dependency>

Modified: servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/pom.xml?rev=966290&r1=966289&r2=966290&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/pom.xml Wed Jul 21 16:05:09 2010
@@ -283,7 +283,7 @@
         </dependency>        
         <dependency>
 		    <groupId>org.apache.geronimo.specs</groupId>
-		    <artifactId>geronimo-annotation_1.0_spec</artifactId>
+		    <artifactId>geronimo-annotation_1.1_spec</artifactId>
             <version>${geronimo.annotation.version}</version>
         </dependency>
         <dependency>

Modified: servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java?rev=966290&r1=966289&r2=966290&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java Wed Jul 21 16:05:09 2010
@@ -77,7 +77,7 @@ public class CXFNMRIntegrationTest exten
         return new String[] {
             getBundle("org.apache.felix", "org.apache.felix.prefs"),
             getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.activation-api-1.1"),
-            getBundle("org.apache.geronimo.specs", "geronimo-annotation_1.0_spec"),
+            getBundle("org.apache.geronimo.specs", "geronimo-annotation_1.1_spec"),
             getBundle("org.apache.geronimo.specs", "geronimo-servlet_2.5_spec"),
             getBundle("org.apache.geronimo.specs", "geronimo-ws-metadata_2.0_spec"),
             getBundle("org.apache.geronimo.specs", "geronimo-j2ee-connector_1.5_spec"),

Modified: servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java?rev=966290&r1=966289&r2=966290&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java Wed Jul 21 16:05:09 2010
@@ -81,7 +81,7 @@ public class IntegrationTest extends Abs
         return new String[] {
             getBundle("org.apache.felix", "org.apache.felix.prefs"),
             getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.activation-api-1.1"),
-            getBundle("org.apache.geronimo.specs", "geronimo-annotation_1.0_spec"),
+            getBundle("org.apache.geronimo.specs", "geronimo-annotation_1.1_spec"),
             getBundle("org.apache.geronimo.specs", "geronimo-servlet_2.5_spec"),
             getBundle("org.apache.geronimo.specs", "geronimo-ws-metadata_2.0_spec"),
             getBundle("org.apache.geronimo.specs", "geronimo-j2ee-connector_1.5_spec"),

Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=966290&r1=966289&r2=966290&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Wed Jul 21 16:05:09 2010
@@ -39,7 +39,6 @@
     <module>deps</module>
     <module>branding</module>
     <module>camel</module>
-    <module>war</module>
     <module>cxf</module>
     <module>examples</module>
     <module>assembly</module>
@@ -110,7 +109,7 @@
       <felix.plugin.version>2.1.0</felix.plugin.version>
       <felix.prefs.version>1.0.4</felix.prefs.version>
       <flatpack.version>3.1.1_3</flatpack.version>
-      <geronimo.annotation.version>1.1.1</geronimo.annotation.version>
+      <geronimo.annotation.version>1.0</geronimo.annotation.version>
       <geronimo.ejb3.version>1.0.1</geronimo.ejb3.version>
       <geronimo.el.version>1.0.1</geronimo.el.version>
       <geronimo.interceptor.version>1.0.1</geronimo.interceptor.version>



Mime
View raw message