You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2017/02/08 20:28:00 UTC

[21/25] servicemix-features git commit: Old modules removed

http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/assemblies/shared/src/main/resources/common-unix-bin.xml
----------------------------------------------------------------------
diff --git a/assemblies/shared/src/main/resources/common-unix-bin.xml b/assemblies/shared/src/main/resources/common-unix-bin.xml
deleted file mode 100644
index f67111c..0000000
--- a/assemblies/shared/src/main/resources/common-unix-bin.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-   
-    http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<component>
-    <fileSets>
-        <!-- Cherry-pick files from the expanded Karaf distribution -->
-        <fileSet>
-            <directory>target/dependencies/unix/apache-karaf-${karaf.version}</directory>
-            <outputDirectory>/</outputDirectory>
-            <excludes>
-              <exclude>**/demos/**</exclude>
-              <exclude>bin/**</exclude>
-              <exclude>etc/system.properties</exclude>
-              <exclude>etc/org.apache.karaf.features.cfg</exclude>
-              <exclude>etc/org.apache.karaf.features.obr.cfg</exclude>
-              <exclude>etc/org.ops4j.pax.logging.cfg</exclude>
-              <exclude>etc/org.ops4j.pax.url.mvn.cfg</exclude>
-              <exclude>etc/users.properties</exclude>
-              <exclude>etc/custom.properties</exclude>
-              <exclude>etc/jre.properties</exclude>
-              <exclude>etc/jre.properties.cxf</exclude>
-              <exclude>system/**</exclude>
-              <exclude>LICENSE</exclude>
-              <exclude>NOTICE</exclude>
-              <exclude>README</exclude>
-              <exclude>RELEASE-NOTES</exclude>
-              <exclude>karaf-manual*</exclude>
-            </excludes>
-        </fileSet>
-
-        <!-- Copy over bin/* scripts separately to get the correct file mode -->
-        <fileSet>
-            <directory>target/dependencies/unix/apache-karaf-${karaf.version}</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-              <include>bin/*</include>
-            </includes>
-            <fileMode>0755</fileMode>
-        </fileSet>
-
-        <!-- Copy license and other files from root -->
-        <fileSet>
-            <directory>${basedir}/../..</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>README</include>
-                <include>RELEASE*</include>
-            </includes>
-            <lineEnding>unix</lineEnding>
-            <fileMode>0644</fileMode>
-        </fileSet>
-
-        <!-- Copy over everything that needs to get unix line endings -->
-        <fileSet>
-            <directory>target/shared/etc</directory>
-            <outputDirectory>/etc/</outputDirectory>
-            <lineEnding>unix</lineEnding>
-            <fileMode>0644</fileMode>
-        </fileSet>
-
-        <fileSet>
-            <directory>target/shared/licenses</directory>
-            <outputDirectory>/licenses/</outputDirectory>
-            <lineEnding>unix</lineEnding>
-            <fileMode>0644</fileMode>
-        </fileSet>
-
-        <!-- Copy over filtered resources -->
-        <fileSet>
-            <directory>target/classes/etc</directory>
-            <outputDirectory>/etc/</outputDirectory>
-            <includes>
-                <include>*.*</include>
-            </includes>
-            <lineEnding>unix</lineEnding>
-            <fileMode>0644</fileMode>
-        </fileSet>
-    </fileSets>
-
-    <files>
-        <file>
-            <source>${basedir}/target/dependencies/unix/apache-karaf-${karaf.version}/bin/karaf</source>
-            <outputDirectory>/bin/</outputDirectory>
-            <destName>servicemix</destName>
-            <fileMode>0755</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
-            <outputDirectory>/</outputDirectory>
-            <destName>LICENSE</destName>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
-            <outputDirectory>/</outputDirectory>
-            <destName>NOTICE</destName>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-    </files>
-
-</component>

http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/assemblies/shared/src/main/resources/common-windows-bin.xml
----------------------------------------------------------------------
diff --git a/assemblies/shared/src/main/resources/common-windows-bin.xml b/assemblies/shared/src/main/resources/common-windows-bin.xml
deleted file mode 100644
index c4257ae..0000000
--- a/assemblies/shared/src/main/resources/common-windows-bin.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<component>
-    <fileSets>
-      <!-- Cherry-pick files from the expanded Karaf distribution -->
-      <fileSet>
-          <directory>target/dependencies/win/apache-karaf-${karaf.version}</directory>
-          <outputDirectory>/</outputDirectory>
-          <excludes>
-             <exclude>**/demos/**</exclude>
-             <exclude>etc/system.properties</exclude>
-             <exclude>etc/org.apache.karaf.features.cfg</exclude>
-             <exclude>etc/org.apache.karaf.features.obr.cfg</exclude>
-             <exclude>etc/org.ops4j.pax.logging.cfg</exclude>
-             <exclude>etc/org.ops4j.pax.url.mvn.cfg</exclude>
-             <exclude>etc/users.properties</exclude>
-             <exclude>etc/custom.properties</exclude>
-             <exclude>etc/jre.properties</exclude>
-             <exclude>etc/jre.properties.cxf</exclude>
-             <exclude>system/**</exclude>
-             <exclude>LICENSE</exclude>
-             <exclude>NOTICE</exclude>
-             <exclude>README</exclude>
-             <exclude>RELEASE-NOTES</exclude>
-             <exclude>karaf-manual*</exclude>
-          </excludes>
-      </fileSet>
-
-      <!-- Copy license and other files from root -->
-      <fileSet>
-          <directory>${basedir}/../..</directory>
-          <outputDirectory>/</outputDirectory>
-          <includes>
-              <include>README</include>
-              <include>RELEASE*</include>
-          </includes>
-          <lineEnding>dos</lineEnding>
-          <fileMode>0644</fileMode>
-      </fileSet>
-
-      <!-- Copy over everything that needs to get dos line endings -->
-      <fileSet>
-          <directory>target/shared/etc</directory>
-          <outputDirectory>/etc/</outputDirectory>
-          <lineEnding>dos</lineEnding>
-          <fileMode>0644</fileMode>
-      </fileSet>
-
-      <fileSet>
-          <directory>target/shared/licenses</directory>
-          <outputDirectory>/licenses/</outputDirectory>
-          <lineEnding>dos</lineEnding>
-          <fileMode>0644</fileMode>
-      </fileSet>
-
-      <fileSet>
-          <directory>target/classes/etc</directory>
-          <outputDirectory>/etc/</outputDirectory>
-          <includes>
-              <include>*.*</include>
-          </includes>
-          <lineEnding>dos</lineEnding>
-          <fileMode>0644</fileMode>
-      </fileSet>
-    </fileSets>
-
-    <files>
-        <file>
-            <source>${basedir}/target/dependencies/win/apache-karaf-${karaf.version}/bin/karaf.bat</source>
-            <outputDirectory>/bin/</outputDirectory>
-            <destName>servicemix.bat</destName>
-            <fileMode>0755</fileMode>
-            <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
-            <outputDirectory>/</outputDirectory>
-            <destName>LICENSE</destName>
-            <fileMode>0644</fileMode>
-            <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
-            <outputDirectory>/</outputDirectory>
-            <destName>NOTICE</destName>
-            <fileMode>0644</fileMode>
-            <lineEnding>dos</lineEnding>
-        </file>
-    </files>
-
-</component>

http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/assemblies/shared/src/main/resources/etc/activemq-broker.xml
----------------------------------------------------------------------
diff --git a/assemblies/shared/src/main/resources/etc/activemq-broker.xml b/assemblies/shared/src/main/resources/etc/activemq-broker.xml
deleted file mode 100644
index b77b90b..0000000
--- a/assemblies/shared/src/main/resources/etc/activemq-broker.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<!--
-    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.
--->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
-           xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"
-           xmlns:amq="http://activemq.apache.org/schema/core"
-           xmlns:blueprint="http://www.osgi.org/xmlns/blueprint/v1.0.0">
-
-    <manifest>
-      Export-Service = javax.jms.ConnectionFactory
-    </manifest>
-
-    <!-- Allows us to use system properties as variables in this configuration file -->
-    <ext:property-placeholder />
-
-    <broker xmlns="http://activemq.apache.org/schema/core" blueprint:id="broker" brokerName="default" dataDirectory="${karaf.data}/activemq/default" useShutdownHook="false">
-       <!--
-            For better performances use VM cursor and small memory limit.
-            For more information, see:
-            
-            http://activemq.apache.org/message-cursors.html
-            
-            Also, if your producer is "hanging", it's probably due to producer flow control.
-            For more information, see:
-            http://activemq.apache.org/producer-flow-control.html
-        -->
-              
-        <destinationPolicy>
-            <policyMap>
-              <policyEntries>
-                <policyEntry topic=">" producerFlowControl="true" memoryLimit="1mb">
-                  <pendingSubscriberPolicy>
-                    <vmCursor />
-                  </pendingSubscriberPolicy>
-                </policyEntry>
-                <policyEntry queue=">" producerFlowControl="true" memoryLimit="1mb">
-                  <!-- Use VM cursor for better latency
-                       For more information, see:
-                       
-                       http://activemq.apache.org/message-cursors.html
-                       
-                  <pendingQueuePolicy>
-                    <vmQueueCursor/>
-                  </pendingQueuePolicy>
-                  -->
-                </policyEntry>
-              </policyEntries>
-            </policyMap>
-        </destinationPolicy> 
-
-        <!-- Use the following to configure how ActiveMQ is exposed in JMX -->
-        <managementContext>
-            <managementContext createConnector="false"/>
-        </managementContext>
-
-        <!-- 
-            Configure message persistence for the broker. The default persistence
-            mechanism is the KahaDB store (identified by the kahaDB tag). 
-            For more information, see: 
-            
-            http://activemq.apache.org/persistence.html 
-        -->
-        <persistenceAdapter>
-            <kahaDB directory="${karaf.data}/activemq/default/kahadb"/>
-        </persistenceAdapter>
-
-       <!--
-            The systemUsage controls the maximum amount of space the broker will 
-            use before slowing down producers. For more information, see:
-            
-            http://activemq.apache.org/producer-flow-control.html
-             
-        <systemUsage>
-            <systemUsage>
-                <memoryUsage>
-                    <memoryUsage limit="20 mb"/>
-                </memoryUsage>
-                <storeUsage>
-                    <storeUsage limit="1 gb" name="foo"/>
-                </storeUsage>
-                <tempUsage>
-                    <tempUsage limit="100 mb"/>
-                </tempUsage>
-            </systemUsage>
-        </systemUsage>
-        -->
-
-        <!-- The transport connectors ActiveMQ will listen to -->
-        <transportConnectors>
-            <transportConnector name="openwire" uri="${activemq.url}"/>
-            <transportConnector name="stomp" uri="stomp://localhost:61613"/>
-        </transportConnectors>
-
-    </broker>
-
-    <bean id="activemqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory" depends-on="broker">
-
-        <property name="brokerURL" value="vm://default?create=false&amp;waitForStart=10000" />
-    </bean>
-
-    <bean id="pooledConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory">
-        <property name="maxConnections" value="8" />
-        <property name="connectionFactory" ref="activemqConnectionFactory" />
-    </bean>
-
-    <bean id="resourceManager" class="org.apache.activemq.pool.ActiveMQResourceManager" init-method="recoverResource">
-        <property name="transactionManager" ref="recoverableTxManager" />
-        <property name="connectionFactory" ref="activemqConnectionFactory" />
-        <property name="resourceName" value="activemq.${name}" />
-    </bean>
-
-    <reference id="recoverableTxManager" interface="org.apache.geronimo.transaction.manager.RecoverableTransactionManager" availability="mandatory" />
-
-    <service ref="pooledConnectionFactory" interface="javax.jms.ConnectionFactory">
-        <service-properties>
-            <entry key="name" value="localhost"/>
-        </service-properties>
-    </service>
-
-</blueprint>
-

http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/assemblies/shared/src/main/resources/etc/custom.properties
----------------------------------------------------------------------
diff --git a/assemblies/shared/src/main/resources/etc/custom.properties b/assemblies/shared/src/main/resources/etc/custom.properties
deleted file mode 100644
index 48bedcb..0000000
--- a/assemblies/shared/src/main/resources/etc/custom.properties
+++ /dev/null
@@ -1,119 +0,0 @@
-################################################################################
-#
-#    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.
-#
-
-karaf.systemBundlesStartLevel=50
-
-# javax.transaction is needed to avoid class loader constraint violation when using javax.sql
-# as servicemix is using sun saaj impl bundle, we should ignore the package of saaj
-# as servicemix is using sun jaxb impl bundle, we should ignore the package of jaxb
-org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,!com.sun.xml.messaging.saaj.*,!com.sun.xml.internal.bind.*,sun.*,com.sun.*,javax.transaction,javax.transaction.*,org.apache.xalan.processor,org.apache.xpath.jaxp,org.apache.xml.dtm.ref,org.apache.xerces.jaxp.datatype,org.apache.xerces.stax,org.apache.xerces.parsers,org.apache.xerces.jaxp,org.apache.xerces.jaxp.validation,org.apache.xerces.dom
-
-
-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, \
-  org.apache.xalan.extensions; version="2.7.1", \
-  org.apache.xalan.xsltc.compiler; version="2.7.1", \
-  org.apache.xalan.xsltc.cmdline.getopt; version="2.7.1", \
-  org.apache.xalan.xsltc.util; version="2.7.1", \
-  org.apache.xalan.transformer; version="2.7.1", \
-  org.apache.xalan.xsltc.trax; version="2.7.1", \
-  org.apache.xalan.processor; version="2.7.1", \
-  org.apache.xalan.lib; version="2.7.1", \
-  org.apache.xalan.trace; version="2.7.1", \
-  org.apache.xalan.xsltc.compiler.util; version="2.7.1", \
-  org.apache.xalan.templates; version="2.7.1", \
-  org.apache.xalan.xsltc; version="2.7.1", \
-  org.apache.xalan.xsltc.runtime; version="2.7.1", \
-  org.apache.xalan; version="2.7.1", \
-  org.apache.xalan.xslt; version="2.7.1", \
-  org.apache.xalan.lib.sql; version="2.7.1", \
-  org.apache.xalan.xsltc.runtime.output; version="2.7.1", \
-  org.apache.xalan.xsltc.dom; version="2.7.1", \
-  org.apache.xalan.client; version="2.7.1", \
-  org.apache.xalan.xsltc.cmdline; version="2.7.1", \
-  org.apache.xalan.serialize; version="2.7.1", \
-  org.apache.xalan.res; version="2.7.1", \
-  org.apache.xml.dtm.ref; version="2.7.1", \
-  org.apache.xml.dtm; version="2.7.1", \
-  org.apache.xml.dtm.ref.sax2dtm; version="2.7.1", \
-  org.apache.xml.dtm.ref.dom2dtm; version="2.7.1", \
-  org.apache.xml.res; version="2.7.1", \
-  org.apache.xml.serializer.dom3; version="2.7.1", \
-  org.apache.xml.serializer; version="2.7.1", \
-  org.apache.xml.serializer.utils; version="2.7.1", \
-  org.apache.xml.utils.res; version="2.7.1", \
-  org.apache.xml.utils; version="2.7.1", \
-  org.apache.xpath.functions; version="2.7.1", \
-  org.apache.xpath.jaxp; version="2.7.1", \
-  org.apache.xpath.patterns; version="2.7.1", \
-  org.apache.xpath.objects; version="2.7.1", \
-  org.apache.xpath.res; version="2.7.1", \
-  org.apache.xpath; version="2.7.1", \
-  org.apache.xpath.axes; version="2.7.1", \
-  org.apache.xpath.compiler; version="2.7.1", \
-  org.apache.xpath.operations; version="2.7.1", \
-  org.apache.xpath.domapi; version="2.7.1", \
-  org.apache.html.dom; version="2.11.0", \
-  org.apache.wml.dom; version="2.11.0", \
-  org.apache.wml; version="2.11.0", \
-  org.apache.xerces.parsers; version="2.11.0", \
-  org.apache.xerces.impl.dtd.models; version="2.11.0", \
-  org.apache.xerces.xni.parser; version="2.11.0", \
-  org.apache.xerces.impl.dv.xs; version="2.11.0", \
-  org.apache.xerces.impl.xs.traversers; version="2.11.0", \
-  org.apache.xerces.util; version="2.11.0", \
-  org.apache.xerces.impl.dtd; version="2.11.0", \
-  org.apache.xerces.jaxp.validation; version="2.11.0", \
-  org.apache.xerces.dom3.as; version="2.11.0", \
-  org.apache.xerces.impl.dv; version="2.11.0", \
-  org.apache.xerces.jaxp; version="2.11.0", \
-  org.apache.xerces.jaxp.datatype; version="2.11.0", \
-  org.apache.xerces.impl.xpath.regex; version="2.11.0", \
-  org.apache.xerces.xni; version="2.11.0", \
-  org.apache.xerces.impl.msg; version="2.11.0", \
-  org.apache.xerces.impl.dv.util; version="2.11.0", \
-  org.apache.xerces.impl.xs.util; version="2.11.0", \
-  org.apache.xerces.dom; version="2.11.0", \
-  org.apache.xerces.dom.events; version="2.11.0", \
-  org.apache.xerces.impl.xs.opti; version="2.11.0", \
-  org.apache.xerces.impl; version="2.11.0", \
-  org.apache.xerces.xs; version="2.11.0", \
-  org.apache.xerces.impl.io; version="2.11.0", \
-  org.apache.xerces.xpointer; version="2.11.0", \
-  org.apache.xerces.impl.dv.dtd; version="2.11.0", \
-  org.apache.xerces.xinclude; version="2.11.0", \
-  org.apache.xerces.impl.xpath; version="2.11.0", \
-  org.apache.xerces.xs.datatypes; version="2.11.0", \
-  org.apache.xerces.impl.xs.identity; version="2.11.0", \
-  org.apache.xerces.impl.xs.models; version="2.11.0", \
-  org.apache.xerces.xni.grammars; version="2.11.0", \
-  org.apache.xerces.impl.xs; version="2.11.0", \
-  org.apache.xerces.impl.validation; version="2.11.0", \
-  org.apache.xml.serialize; version="2.11.0" 
-

http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/assemblies/shared/src/main/resources/etc/jre.properties
----------------------------------------------------------------------
diff --git a/assemblies/shared/src/main/resources/etc/jre.properties b/assemblies/shared/src/main/resources/etc/jre.properties
deleted file mode 100644
index fcab1b2..0000000
--- a/assemblies/shared/src/main/resources/etc/jre.properties
+++ /dev/null
@@ -1,297 +0,0 @@
-################################################################################
-#
-#    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.6= \
- javax.accessibility, \
- javax.activity, \
- javax.annotation;version="1.1", \
- javax.annotation.processing;version="1.1", \
- 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.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.datatype, \
- javax.xml.namespace, \
- javax.xml.parsers, \
- javax.xml.transform, \
- javax.xml.transform.dom, \
- javax.xml.transform.sax, \
- javax.xml.transform.stax, \
- 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.w3c.dom.xpath, \
- org.xml.sax, \
- org.xml.sax.ext, \
- org.xml.sax.helpers
-
-# Standard package set.  Note that:
-#   - javax.transaction* is exported with a mandatory attribute
-jre-1.7= \
- javax.accessibility, \
- javax.activity, \
- javax.annotation;version="1.1", \
- javax.annotation.processing;version="1.1", \
- 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.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.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.transform, \
- javax.xml.transform.dom, \
- javax.xml.transform.sax, \
- javax.xml.transform.stax, \
- 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

http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/assemblies/shared/src/main/resources/etc/org.apache.aries.transaction.cfg
----------------------------------------------------------------------
diff --git a/assemblies/shared/src/main/resources/etc/org.apache.aries.transaction.cfg b/assemblies/shared/src/main/resources/etc/org.apache.aries.transaction.cfg
deleted file mode 100644
index 6083d8c..0000000
--- a/assemblies/shared/src/main/resources/etc/org.apache.aries.transaction.cfg
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# 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/
-aries.transaction.recoverable=true

http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/assemblies/shared/src/main/resources/etc/org.apache.karaf.features.obr.cfg
----------------------------------------------------------------------
diff --git a/assemblies/shared/src/main/resources/etc/org.apache.karaf.features.obr.cfg b/assemblies/shared/src/main/resources/etc/org.apache.karaf.features.obr.cfg
deleted file mode 100644
index ec72283..0000000
--- a/assemblies/shared/src/main/resources/etc/org.apache.karaf.features.obr.cfg
+++ /dev/null
@@ -1,28 +0,0 @@
-################################################################################
-#
-#    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.
-#
-################################################################################
-
-#
-# This configuration file is used to configure the default values for features OBR resolver
-#
-
-#
-# Defines whether or not the features OBR resolver has to resolve optional imports as well.  The default value is
-# false (do not attempt to resolve optional imports).
-#
-resolveOptionalImports = true

http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/assemblies/shared/src/main/resources/etc/org.apache.servicemix.jbi.cfg
----------------------------------------------------------------------
diff --git a/assemblies/shared/src/main/resources/etc/org.apache.servicemix.jbi.cfg b/assemblies/shared/src/main/resources/etc/org.apache.servicemix.jbi.cfg
deleted file mode 100644
index 770601d..0000000
--- a/assemblies/shared/src/main/resources/etc/org.apache.servicemix.jbi.cfg
+++ /dev/null
@@ -1,34 +0,0 @@
-################################################################################
-#
-#    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.
-#
-################################################################################
-
-# When using a forced shutdown of a SA, all pending synchronous exchanges will be canceled after this timeout
-# The value is specified in ms, the default value of 0 will wait indefinitely for all exchanges to finish
-shutdownTimeout=0
-
-# The values below can be used to configure the thread pool size for the ServiceMix JBI components.
-# - corePoolSize defines the core thread pool size (default is 4)
-# - maximumPoolSize defines the maximum thread pool size, -1 means an unbounded thread pool size (default is -1)
-# - queueSize defines the executor queue size (default is 1024)
-# - allowCoreThreadTimeOut allows the core threads to timeout (defaults to true)
-# - keepAliveTime is the amount of milliseconds a thread is kept alive when idle (defaults to 60000)
-corePoolSize=4
-maximumPoolSize=-1
-queueSize=1024
-allowCoreThreadTimeOut=true
-keepAliveTime=60000

http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/assemblies/shared/src/main/resources/etc/org.apache.servicemix.nmr.cfg
----------------------------------------------------------------------
diff --git a/assemblies/shared/src/main/resources/etc/org.apache.servicemix.nmr.cfg b/assemblies/shared/src/main/resources/etc/org.apache.servicemix.nmr.cfg
deleted file mode 100644
index 038a0d3..0000000
--- a/assemblies/shared/src/main/resources/etc/org.apache.servicemix.nmr.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-################################################################################
-#
-#    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.
-#
-################################################################################
-
-# The values below can be used to configure the thread pool size for NMR endpoints.
-# - corePoolSize defines the core thread pool size (default is 4)
-# - maximumPoolSize defines the maximum thread pool size, -1 means an unbounded thread pool size (default is -1)
-# - queueSize defines the executor queue size (default is 1024)
-# - allowCoreThreadTimeOut allows the core threads to timeout (defaults to true)
-# - keepAliveTime is the amount of milliseconds a thread is kept alive when idle (defaults to 60000)
-#
-# Endpoints are provided a ThreadPool with specific configuration.  If no configuration
-# can be found for the endpoint name, the default one can be used.
-# A given thread pool can be configured by prefixing the above properties with the name followed by a dot.
-# For example:
-#   foo.bar.corePoolSize=16
-#
-corePoolSize=4
-maximumPoolSize=-1
-queueSize=1024
-allowCoreThreadTimeOut=true
-keepAliveTime=60000

http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/assemblies/shared/src/main/resources/etc/org.ops4j.pax.logging.cfg
----------------------------------------------------------------------
diff --git a/assemblies/shared/src/main/resources/etc/org.ops4j.pax.logging.cfg b/assemblies/shared/src/main/resources/etc/org.ops4j.pax.logging.cfg
deleted file mode 100644
index 515fdc8..0000000
--- a/assemblies/shared/src/main/resources/etc/org.ops4j.pax.logging.cfg
+++ /dev/null
@@ -1,46 +0,0 @@
-################################################################################
-#
-#    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.
-#
-################################################################################
-
-# 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} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
-
-# File appender
-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} | %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} | %m%n
-log4j.appender.sift.appender.file=${karaf.data}/log/$\\{bundle.name\\}.log
-log4j.appender.sift.appender.append=true

http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/assemblies/shared/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
----------------------------------------------------------------------
diff --git a/assemblies/shared/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg b/assemblies/shared/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
deleted file mode 100644
index 54007cc..0000000
--- a/assemblies/shared/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
+++ /dev/null
@@ -1,100 +0,0 @@
-################################################################################
-#
-#    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.
-#
-################################################################################
-
-#
-# If set to true, the following property will not allow any certificate to be used
-# when accessing Maven repositories through SSL
-#
-#org.ops4j.pax.url.mvn.certificateCheck=
-
-#
-# Path to the local Maven settings file.
-# The repositories defined in this file will be automatically added to the list
-# of default repositories if the 'org.ops4j.pax.url.mvn.repositories' property
-# below is not set.
-# The following locations are checked for the existence of the settings.xml file
-#   * 1. looks for the specified url
-#   * 2. if not found looks for ${user.home}/.m2/settings.xml
-#   * 3. if not found looks for ${maven.home}/conf/settings.xml
-#   * 4. if not found looks for ${M2_HOME}/conf/settings.xml
-#
-#org.ops4j.pax.url.mvn.settings=
-
-#
-# Path to the local Maven repository which is used to avoid downloading
-# artifacts when they already exist locally.
-# The value of this property will be extracted from the settings.xml file
-# above, or defaulted to:
-#     System.getProperty( "user.home" ) + "/.m2/repository"
-#
-#org.ops4j.pax.url.mvn.localRepository=
-
-#
-# Default this to false. It's just weird to use undocumented repos
-#
-org.ops4j.pax.url.mvn.useFallbackRepositories=false
-
-#
-# Uncomment if you don't wanna use the proxy settings
-# from the Maven conf/settings.xml file
-#
-# org.ops4j.pax.url.mvn.proxySupport=false
-
-#
-# Disable aether support by default.  This ensure that the defaultRepositories
-# below will be used
-#
-org.ops4j.pax.url.mvn.disableAether=true
-
-#
-# Comma separated list of repositories scanned when resolving an artifact.
-# Those repositories will be checked before iterating through the
-#    below list of repositories and even before the local repository
-# A repository url can be appended with zero or more of the following flags:
-#    @snapshots  : the repository contains snaphots
-#    @noreleases : the repository does not contain any released artifacts
-#
-# The following property value will add the system folder as a repo.
-#
-org.ops4j.pax.url.mvn.defaultRepositories=file:${karaf.home}/${karaf.default.repository}@snapshots,\
-    file:${karaf.home}/local-repo@snapshots
-
-#
-# Comma separated list of repositories scanned when resolving an artifact.
-# The default list includes the following repositories:
-#    http://repo1.maven.org/maven2
-#    http://repository.apache.org/content/groups/snapshots-group
-#    http://svn.apache.org/repos/asf/servicemix/m2-repo
-#    http://repository.springsource.com/maven/bundles/release
-#    http://repository.springsource.com/maven/bundles/external
-# To add repositories to the default ones, prepend '+' to the list of repositories
-# to add.
-# A repository url can be appended with zero or more of the following flags:
-#    @snapshots  : the repository contains snaphots
-#    @noreleases : the repository does not contain any released artifacts
-#
-org.ops4j.pax.url.mvn.repositories= \
-    http://repo1.maven.org/maven2, \
-    http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases, \
-    http://svn.apache.org/repos/asf/servicemix/m2-repo, \
-    http://repository.springsource.com/maven/bundles/release, \
-    http://repository.springsource.com/maven/bundles/external, \
-    http://oss.sonatype.org/content/repositories/releases/, \
-    https://maven.alfresco.com/nexus/content/groups/public/
-

http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/assemblies/shared/src/main/resources/etc/org.ops4j.pax.web.cfg.empty.stub
----------------------------------------------------------------------
diff --git a/assemblies/shared/src/main/resources/etc/org.ops4j.pax.web.cfg.empty.stub b/assemblies/shared/src/main/resources/etc/org.ops4j.pax.web.cfg.empty.stub
deleted file mode 100644
index c83c914..0000000
--- a/assemblies/shared/src/main/resources/etc/org.ops4j.pax.web.cfg.empty.stub
+++ /dev/null
@@ -1,41 +0,0 @@
-################################################################################
-#
-#    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.
-#
-#################################################################################
-
-#################################################################################
-#
-#    This is a stub configuration file for pax-web ssl configuration.
-#    More details please refer to 
-#    http://wiki.ops4j.org/display/paxweb/SSL+Configuration
-#    Important Notes: If file named org.ops4j.pax.web.cfg in etc folder,
-#                     Pax Web will always try to read configuration from
-                      this file, so any org.ops4j.pax.web configuration 
-                      in http feature get ignored, that's why we name this 
-                      file as org.ops4j.pax.web.empty.stub.
-                      If you need this configuration file, rename it to
-                      org.ops4j.pax.web before use it.
-#################################################################################
-
-#org.osgi.service.http.secure.enabled=true
-#org.ops4j.pax.web.ssl.keystore=etc/servicemix.jks
-#org.ops4j.pax.web.ssl.password=password
-#org.ops4j.pax.web.ssl.keypassword=password
-#org.osgi.service.http.port.secure=8443
-org.ops4j.pax.web.config.file=etc/jetty.xml
-org.osgi.service.http.port=8181
-javax.servlet.context.tempdir=data/pax-web-jsp

http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/assemblies/shared/src/main/resources/etc/system.properties
----------------------------------------------------------------------
diff --git a/assemblies/shared/src/main/resources/etc/system.properties b/assemblies/shared/src/main/resources/etc/system.properties
deleted file mode 100644
index bf73988..0000000
--- a/assemblies/shared/src/main/resources/etc/system.properties
+++ /dev/null
@@ -1,123 +0,0 @@
-################################################################################
-#
-#    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.
-#
-################################################################################
-
-#
-# 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
-
-#
-# Default role name used for console authorization (JMX, SSH and WEB)
-# The syntax is the following:
-#   [classname:]principal
-# where classname is the class name of the principal object
-# (defaults to org.apache.karaf.jaas.modules.RolePrincipal)
-# and principal is the name of the principal of that class
-# (defaults to admin).
-#
-# Note that this value can be overriden using the various ConfigAdmin
-# configurations for JMX, SSH or the WebConsole.
-#
-karaf.admin.role=admin
-
-
-
-#
-# 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
-
-#
-# Allow usage of ${servicemix.home} as an alias for ${karaf.home}
-#
-servicemix.home=${karaf.home}
-
-#
-# Activemq configuration
-#
-activemq.port = 61616
-activemq.host = localhost
-activemq.url = tcp://${activemq.host}:${activemq.port}
-
-
-#
-# Activemq JMX configuration
-#
-activemq.jmx.url=service:jmx:rmi:///jndi/rmi://localhost:1099/karaf-${karaf.name}
-activemq.jmx.user=smx
-activemq.jmx.password=smx
-
-#
-# Activemq Webconsole configuration
-#
-webconsole.type=properties
-webconsole.jms.url=${activemq.url}
-webconsole.jmx.url=service:jmx:rmi:///jndi/rmi://localhost:1099/karaf-${karaf.name}
-webconsole.jmx.user=smx
-webconsole.jmx.password=smx
-
-
-javax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
-javax.xml.transform.TransformerFactory=org.apache.xalan.processor.TransformerFactoryImpl
-
-#
-# CXF Log configuration
-#
-org.apache.cxf.Logger=org.apache.cxf.common.logging.Slf4jLogger
-
-# Workaround for KARAF-1117: Jetty will use a JUL logger.
-org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.JavaUtilLog

http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/assemblies/shared/src/main/resources/etc/users.properties
----------------------------------------------------------------------
diff --git a/assemblies/shared/src/main/resources/etc/users.properties b/assemblies/shared/src/main/resources/etc/users.properties
deleted file mode 100644
index 0348fae..0000000
--- a/assemblies/shared/src/main/resources/etc/users.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-################################################################################
-#
-#    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.
-#
-################################################################################
-
-#
-smx=smx,admin

http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/assemblies/shared/src/main/resources/examples-unix-bin.xml
----------------------------------------------------------------------
diff --git a/assemblies/shared/src/main/resources/examples-unix-bin.xml b/assemblies/shared/src/main/resources/examples-unix-bin.xml
deleted file mode 100644
index f7402ea..0000000
--- a/assemblies/shared/src/main/resources/examples-unix-bin.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-   
-    http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<component>
-    <fileSets>
-        <!-- Copy over karaf demo to examples folder -->
-        <fileSet>
-            <directory>target/dependencies/unix/apache-karaf-${karaf.version}/demos</directory>
-            <outputDirectory>/examples/karaf</outputDirectory>
-            <lineEnding>unix</lineEnding>
-        </fileSet>
-
-        <!-- Copy over the examples -->
-        <fileSet>
-            <directory>${basedir}/../../examples</directory>
-            <outputDirectory>/examples/</outputDirectory>
-            <lineEnding>unix</lineEnding>
-            <includes>
-                <include>activemq/**</include>
-                <include>activiti/**</include>
-                <include>camel/**</include>
-                <include>cxf/**</include>
-            </includes>
-            <excludes>
-                <exclude>pom.xml</exclude>
-                <!-- we need add filtered README.txt, so exclude the raw one here -->
-                <exclude>**/README.txt</exclude>
-                <!-- exclude build output/IDE config/... files -->
-                <exclude>**/target/**</exclude>
-                <exclude>**/.classpath</exclude>
-                <exclude>**/.project</exclude>
-                <exclude>**/.settings/**</exclude>
-                <exclude>**/*.i??</exclude>
-            </excludes>
-        </fileSet>
-
-        <fileSet>
-            <directory>${basedir}/../../examples</directory>
-            <outputDirectory>/examples/</outputDirectory>
-            <lineEnding>unix</lineEnding>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <includes>
-                <include>README.txt</include>
-                <include>activemq/**/README.txt</include>
-                <include>activiti/**/README.txt</include>
-                <include>camel/**/README.txt</include>
-                <include>cxf/**/README.txt</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-
-    <files>
-        <file>
-            <source>${basedir}/target/shared/pom.xml</source>
-            <outputDirectory>/examples/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-    </files>
-
-</component>

http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/assemblies/shared/src/main/resources/examples-windows-bin.xml
----------------------------------------------------------------------
diff --git a/assemblies/shared/src/main/resources/examples-windows-bin.xml b/assemblies/shared/src/main/resources/examples-windows-bin.xml
deleted file mode 100644
index 7fb72bd..0000000
--- a/assemblies/shared/src/main/resources/examples-windows-bin.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<component>
-    <fileSets>
-      <!-- Copy over kernel demo to examples folder -->
-      <fileSet>
-          <directory>target/dependencies/win/apache-karaf-${karaf.version}/demos</directory>
-          <outputDirectory>/examples/karaf</outputDirectory>
-          <lineEnding>dos</lineEnding>
-      </fileSet>
-
-      <!-- Copy over the examples -->
-      <fileSet>
-          <directory>${basedir}/../../examples</directory>
-          <outputDirectory>/examples/</outputDirectory>
-          <lineEnding>dos</lineEnding>
-          <includes>
-              <include>activemq/**</include>
-              <include>activiti/**</include>
-              <include>camel/**</include>
-              <include>cxf/**</include>
-          </includes>
-          <excludes>
-              <exclude>pom.xml</exclude>
-              <!--we need add filtered README.txt, so exclude the raw one here-->
-              <exclude>**/README.txt</exclude>
-              <!-- exclude build output/IDE config/... files -->
-              <exclude>**/target/**</exclude>
-              <exclude>**/.classpath</exclude>
-              <exclude>**/.project</exclude>
-              <exclude>**/.settings/**</exclude>
-              <exclude>**/*.i??</exclude>
-          </excludes>
-      </fileSet>
-
-        <fileSet>
-            <directory>${basedir}/../../examples</directory>
-            <outputDirectory>/examples</outputDirectory>
-            <lineEnding>dos</lineEnding>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <includes>
-                <include>README.txt</include>
-                <include>activemq/**/README.txt</include>
-                <include>activiti/**/README.txt</include>
-                <include>camel/**/README.txt</include>
-                <include>cxf/**/README.txt</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-
-    <files>
-        <file>
-            <source>${basedir}/target/shared/pom.xml</source>
-            <outputDirectory>/examples/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-            <lineEnding>dos</lineEnding>
-        </file>
-    </files>
-
-</component>

http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/assemblies/shared/src/main/resources/licenses/asm.txt
----------------------------------------------------------------------
diff --git a/assemblies/shared/src/main/resources/licenses/asm.txt b/assemblies/shared/src/main/resources/licenses/asm.txt
deleted file mode 100644
index 6eff43a..0000000
--- a/assemblies/shared/src/main/resources/licenses/asm.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Copyright (c) 2000-2005 INRIA, France Telecom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holders nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
-

http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/assemblies/shared/src/main/resources/licenses/bsd.txt
----------------------------------------------------------------------
diff --git a/assemblies/shared/src/main/resources/licenses/bsd.txt b/assemblies/shared/src/main/resources/licenses/bsd.txt
deleted file mode 100644
index 1568be2..0000000
--- a/assemblies/shared/src/main/resources/licenses/bsd.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-The BSD License
-
-   Copyright (c) <YEAR>, <OWNER>
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-    * Neither the name of the <ORGANIZATION> nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/assemblies/shared/src/main/resources/licenses/cddl-1.0.txt
----------------------------------------------------------------------
diff --git a/assemblies/shared/src/main/resources/licenses/cddl-1.0.txt b/assemblies/shared/src/main/resources/licenses/cddl-1.0.txt
deleted file mode 100644
index 4830da9..0000000
--- a/assemblies/shared/src/main/resources/licenses/cddl-1.0.txt
+++ /dev/null
@@ -1,385 +0,0 @@
-
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-
-      1. Definitions.
-
-            1.1. �Contributor� means each individual or entity that
-            creates or contributes to the creation of Modifications.
-
-            1.2. �Contributor Version� means the combination of the
-            Original Software, prior Modifications used by a
-            Contributor (if any), and the Modifications made by that
-            particular Contributor.
-
-            1.3. �Covered Software� means (a) the Original Software, or
-            (b) Modifications, or (c) the combination of files
-            containing Original Software with files containing
-            Modifications, in each case including portions thereof.
-
-            1.4. �Executable� means the Covered Software in any form
-            other than Source Code. 
-
-            1.5. �Initial Developer� means the individual or entity
-            that first makes Original Software available under this
-            License. 
-            
-            1.6. �Larger Work� means a work which combines Covered
-            Software or portions thereof with code not governed by the
-            terms of this License.
-
-            1.7. �License� means this document.
-
-            1.8. �Licensable� means having the right to grant, to the
-            maximum extent possible, whether at the time of the initial
-            grant or subsequently acquired, any and all of the rights
-            conveyed herein.
-            
-            1.9. �Modifications� means the Source Code and Executable
-            form of any of the following: 
-
-                  A. Any file that results from an addition to,
-                  deletion from or modification of the contents of a
-                  file containing Original Software or previous
-                  Modifications; 
-
-                  B. Any new file that contains any part of the
-                  Original Software or previous Modification; or 
-
-                  C. Any new file that is contributed or otherwise made
-                  available under the terms of this License.
-
-            1.10. �Original Software� means the Source Code and
-            Executable form of computer software code that is
-            originally released under this License. 
-
-            1.11. �Patent Claims� means any patent claim(s), now owned
-            or hereafter acquired, including without limitation,
-            method, process, and apparatus claims, in any patent
-            Licensable by grantor. 
-
-            1.12. �Source Code� means (a) the common form of computer
-            software code in which modifications are made and (b)
-            associated documentation included in or with such code.
-
-            1.13. �You� (or �Your�) means an individual or a legal
-            entity exercising rights under, and complying with all of
-            the terms of, this License. For legal entities, �You�
-            includes any entity which controls, is controlled by, or is
-            under common control with You. For purposes of this
-            definition, �control� means (a) the power, direct or
-            indirect, to cause the direction or management of such
-            entity, whether by contract or otherwise, or (b) ownership
-            of more than fifty percent (50%) of the outstanding shares
-            or beneficial ownership of such entity.
-
-      2. License Grants. 
-
-            2.1. The Initial Developer Grant.
-
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, the
-            Initial Developer hereby grants You a world-wide,
-            royalty-free, non-exclusive license: 
-
-                  (a) under intellectual property rights (other than
-                  patent or trademark) Licensable by Initial Developer,
-                  to use, reproduce, modify, display, perform,
-                  sublicense and distribute the Original Software (or
-                  portions thereof), with or without Modifications,
-                  and/or as part of a Larger Work; and 
-
-                  (b) under Patent Claims infringed by the making,
-                  using or selling of Original Software, to make, have
-                  made, use, practice, sell, and offer for sale, and/or
-                  otherwise dispose of the Original Software (or
-                  portions thereof). 
-
-                  (c) The licenses granted in Sections 2.1(a) and (b)
-                  are effective on the date Initial Developer first
-                  distributes or otherwise makes the Original Software
-                  available to a third party under the terms of this
-                  License. 
-
-                  (d) Notwithstanding Section 2.1(b) above, no patent
-                  license is granted: (1) for code that You delete from
-                  the Original Software, or (2) for infringements
-                  caused by: (i) the modification of the Original
-                  Software, or (ii) the combination of the Original
-                  Software with other software or devices. 
-
-            2.2. Contributor Grant.
-
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, each
-            Contributor hereby grants You a world-wide, royalty-free,
-            non-exclusive license:
-
-                  (a) under intellectual property rights (other than
-                  patent or trademark) Licensable by Contributor to
-                  use, reproduce, modify, display, perform, sublicense
-                  and distribute the Modifications created by such
-                  Contributor (or portions thereof), either on an
-                  unmodified basis, with other Modifications, as
-                  Covered Software and/or as part of a Larger Work; and
-                  
-
-                  (b) under Patent Claims infringed by the making,
-                  using, or selling of Modifications made by that
-                  Contributor either alone and/or in combination with
-                  its Contributor Version (or portions of such
-                  combination), to make, use, sell, offer for sale,
-                  have made, and/or otherwise dispose of: (1)
-                  Modifications made by that Contributor (or portions
-                  thereof); and (2) the combination of Modifications
-                  made by that Contributor with its Contributor Version
-                  (or portions of such combination). 
-
-                  (c) The licenses granted in Sections 2.2(a) and
-                  2.2(b) are effective on the date Contributor first
-                  distributes or otherwise makes the Modifications
-                  available to a third party. 
-
-                  (d) Notwithstanding Section 2.2(b) above, no patent
-                  license is granted: (1) for any code that Contributor
-                  has deleted from the Contributor Version; (2) for
-                  infringements caused by: (i) third party
-                  modifications of Contributor Version, or (ii) the
-                  combination of Modifications made by that Contributor
-                  with other software (except as part of the
-                  Contributor Version) or other devices; or (3) under
-                  Patent Claims infringed by Covered Software in the
-                  absence of Modifications made by that Contributor. 
-
-      3. Distribution Obligations.
-
-            3.1. Availability of Source Code.
-
-            Any Covered Software that You distribute or otherwise make
-            available in Executable form must also be made available in
-            Source Code form and that Source Code form must be
-            distributed only under the terms of this License. You must
-            include a copy of this License with every copy of the
-            Source Code form of the Covered Software You distribute or
-            otherwise make available. You must inform recipients of any
-            such Covered Software in Executable form as to how they can
-            obtain such Covered Software in Source Code form in a
-            reasonable manner on or through a medium customarily used
-            for software exchange.
-
-            3.2. Modifications.
-
-            The Modifications that You create or to which You
-            contribute are governed by the terms of this License. You
-            represent that You believe Your Modifications are Your
-            original creation(s) and/or You have sufficient rights to
-            grant the rights conveyed by this License.
-
-            3.3. Required Notices.
-
-            You must include a notice in each of Your Modifications
-            that identifies You as the Contributor of the Modification.
-            You may not remove or alter any copyright, patent or
-            trademark notices contained within the Covered Software, or
-            any notices of licensing or any descriptive text giving
-            attribution to any Contributor or the Initial Developer.
-
-            3.4. Application of Additional Terms.
-
-            You may not offer or impose any terms on any Covered
-            Software in Source Code form that alters or restricts the
-            applicable version of this License or the recipients�
-            rights hereunder. You may choose to offer, and to charge a
-            fee for, warranty, support, indemnity or liability
-            obligations to one or more recipients of Covered Software.
-            However, you may do so only on Your own behalf, and not on
-            behalf of the Initial Developer or any Contributor. You
-            must make it absolutely clear that any such warranty,
-            support, indemnity or liability obligation is offered by
-            You alone, and You hereby agree to indemnify the Initial
-            Developer and every Contributor for any liability incurred
-            by the Initial Developer or such Contributor as a result of
-            warranty, support, indemnity or liability terms You offer.
-          
-
-            3.5. Distribution of Executable Versions.
-
-            You may distribute the Executable form of the Covered
-            Software under the terms of this License or under the terms
-            of a license of Your choice, which may contain terms
-            different from this License, provided that You are in
-            compliance with the terms of this License and that the
-            license for the Executable form does not attempt to limit
-            or alter the recipient�s rights in the Source Code form
-            from the rights set forth in this License. If You
-            distribute the Covered Software in Executable form under a
-            different license, You must make it absolutely clear that
-            any terms which differ from this License are offered by You
-            alone, not by the Initial Developer or Contributor. You
-            hereby agree to indemnify the Initial Developer and every
-            Contributor for any liability incurred by the Initial
-            Developer or such Contributor as a result of any such terms
-            You offer.
-
-            3.6. Larger Works.
-
-            You may create a Larger Work by combining Covered Software
-            with other code not governed by the terms of this License
-            and distribute the Larger Work as a single product. In such
-            a case, You must make sure the requirements of this License
-            are fulfilled for the Covered Software. 
-            
-      4. Versions of the License. 
-
-            4.1. New Versions.
-
-            Sun Microsystems, Inc. is the initial license steward and
-            may publish revised and/or new versions of this License
-            from time to time. Each version will be given a
-            distinguishing version number. Except as provided in
-            Section 4.3, no one other than the license steward has the
-            right to modify this License. 
-
-            4.2. Effect of New Versions.
-
-            You may always continue to use, distribute or otherwise
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. If the Initial Developer includes a
-            notice in the Original Software prohibiting it from being
-            distributed or otherwise made available under any
-            subsequent version of the License, You must distribute and
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. Otherwise, You may also choose to
-            use, distribute or otherwise make the Covered Software
-            available under the terms of any subsequent version of the
-            License published by the license steward. 
-
-            4.3. Modified Versions.
-
-            When You are an Initial Developer and You want to create a
-            new license for Your Original Software, You may create and
-            use a modified version of this License if You: (a) rename
-            the license and remove any references to the name of the
-            license steward (except to note that the license differs
-            from this License); and (b) otherwise make it clear that
-            the license contains terms which differ from this License.
-            
-
-      5. DISCLAIMER OF WARRANTY.
-
-      COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN �AS IS�
-      BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-      INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
-      SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
-      PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
-      PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
-      COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
-      INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
-      ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
-      WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-      ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
-      DISCLAIMER. 
-
-      6. TERMINATION. 
-
-            6.1. This License and the rights granted hereunder will
-            terminate automatically if You fail to comply with terms
-            herein and fail to cure such breach within 30 days of
-            becoming aware of the breach. Provisions which, by their
-            nature, must remain in effect beyond the termination of
-            this License shall survive.
-
-            6.2. If You assert a patent infringement claim (excluding
-            declaratory judgment actions) against Initial Developer or
-            a Contributor (the Initial Developer or Contributor against
-            whom You assert such claim is referred to as �Participant�)
-            alleging that the Participant Software (meaning the
-            Contributor Version where the Participant is a Contributor
-            or the Original Software where the Participant is the
-            Initial Developer) directly or indirectly infringes any
-            patent, then any and all rights granted directly or
-            indirectly to You by such Participant, the Initial
-            Developer (if the Initial Developer is not the Participant)
-            and all Contributors under Sections 2.1 and/or 2.2 of this
-            License shall, upon 60 days notice from Participant
-            terminate prospectively and automatically at the expiration
-            of such 60 day notice period, unless if within such 60 day
-            period You withdraw Your claim with respect to the
-            Participant Software against such Participant either
-            unilaterally or pursuant to a written agreement with
-            Participant.
-
-            6.3. In the event of termination under Sections 6.1 or 6.2
-            above, all end user licenses that have been validly granted
-            by You or any distributor hereunder prior to termination
-            (excluding licenses granted to You by any distributor)
-            shall survive termination.
-
-      7. LIMITATION OF LIABILITY.
-
-      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-      (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
-      INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
-      COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
-      LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
-      CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-      LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
-      STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-      COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-      INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-      LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
-      INJURY RESULTING FROM SUCH PARTY�S NEGLIGENCE TO THE EXTENT
-      APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
-      NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
-      CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
-      APPLY TO YOU.
-
-      8. U.S. GOVERNMENT END USERS.
-
-      The Covered Software is a �commercial item,� as that term is
-      defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of �commercial
-      computer software� (as that term is defined at 48 C.F.R. �
-      252.227-7014(a)(1)) and �commercial computer software
-      documentation� as such terms are used in 48 C.F.R. 12.212 (Sept.
-      1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
-      through 227.7202-4 (June 1995), all U.S. Government End Users
-      acquire Covered Software with only those rights set forth herein.
-      This U.S. Government Rights clause is in lieu of, and supersedes,
-      any other FAR, DFAR, or other clause or provision that addresses
-      Government rights in computer software under this License.
-
-      9. MISCELLANEOUS.
-
-      This License represents the complete agreement concerning subject
-      matter hereof. If any provision of this License is held to be
-      unenforceable, such provision shall be reformed only to the
-      extent necessary to make it enforceable. This License shall be
-      governed by the law of the jurisdiction specified in a notice
-      contained within the Original Software (except to the extent
-      applicable law, if any, provides otherwise), excluding such
-      jurisdiction�s conflict-of-law provisions. Any litigation
-      relating to this License shall be subject to the jurisdiction of
-      the courts located in the jurisdiction and venue specified in a
-      notice contained within the Original Software, with the losing
-      party responsible for costs, including, without limitation, court
-      costs and reasonable attorneys� fees and expenses. The
-      application of the United Nations Convention on Contracts for the
-      International Sale of Goods is expressly excluded. Any law or
-      regulation which provides that the language of a contract shall
-      be construed against the drafter shall not apply to this License.
-      You agree that You alone are responsible for compliance with the
-      United States export administration regulations (and the export
-      control laws and regulation of any other countries) when You use,
-      distribute or otherwise make available any Covered Software.
-
-      10. RESPONSIBILITY FOR CLAIMS.
-
-      As between Initial Developer and the Contributors, each party is
-      responsible for claims and damages arising, directly or
-      indirectly, out of its utilization of rights under this License
-      and You agree to work with Initial Developer and Contributors to
-      distribute such responsibility on an equitable basis. Nothing
-      herein is intended or shall be deemed to constitute any admission
-      of liability.