You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2014/02/13 21:07:26 UTC
svn commit: r1568023 - in /servicemix/smx5/trunk: ./
assemblies/apache-servicemix-full/src/main/filtered-resources/etc/
assemblies/apache-servicemix-minimal/ assemblies/apache-servicemix/
assemblies/apache-servicemix/src/main/filtered-resources/ assemb...
Author: gertv
Date: Thu Feb 13 20:07:25 2014
New Revision: 1568023
URL: http://svn.apache.org/r1568023
Log:
Remove core and audit modules
Removed:
servicemix/smx5/trunk/audit/
servicemix/smx5/trunk/core/
Modified:
servicemix/smx5/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
servicemix/smx5/trunk/assemblies/apache-servicemix-minimal/pom.xml
servicemix/smx5/trunk/assemblies/apache-servicemix/pom.xml
servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
servicemix/smx5/trunk/assemblies/shared/src/main/filtered-resources/startup-obr.properties
servicemix/smx5/trunk/itests/pom.xml
servicemix/smx5/trunk/pom.xml
Modified: servicemix/smx5/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=1568023&r1=1568022&r2=1568023&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (original)
+++ servicemix/smx5/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg Thu Feb 13 20:07:25 2014
@@ -25,5 +25,5 @@ featuresRepositories=mvn:org.apache.kara
#
# Comma separated list of features to install at startup
#
-featuresBoot=karaf-framework,config,activemq-broker,jaxrs-api,core,camel,camel-cxf,camel-blueprint,war
+featuresBoot=karaf-framework,config,activemq-broker,jaxrs-api,camel,camel-cxf,camel-blueprint,war
Modified: servicemix/smx5/trunk/assemblies/apache-servicemix-minimal/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/apache-servicemix-minimal/pom.xml?rev=1568023&r1=1568022&r2=1568023&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/apache-servicemix-minimal/pom.xml (original)
+++ servicemix/smx5/trunk/assemblies/apache-servicemix-minimal/pom.xml Thu Feb 13 20:07:25 2014
@@ -55,7 +55,6 @@
<descriptor>mvn:org.apache.servicemix/apache-servicemix/${project.version}/xml/features</descriptor>
</descriptors>
<features>
- <feature>core</feature>
<feature>obr</feature>
</features>
<includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
Modified: servicemix/smx5/trunk/assemblies/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/apache-servicemix/pom.xml?rev=1568023&r1=1568022&r2=1568023&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/apache-servicemix/pom.xml (original)
+++ servicemix/smx5/trunk/assemblies/apache-servicemix/pom.xml Thu Feb 13 20:07:25 2014
@@ -117,7 +117,6 @@
<descriptor>file:${basedir}/target/classes/features.xml</descriptor>
</descriptors>
<features>
- <feature>core</feature>
<feature>cxf</feature>
<feature>obr</feature>
<feature>config</feature>
Modified: servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=1568023&r1=1568022&r2=1568023&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (original)
+++ servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg Thu Feb 13 20:07:25 2014
@@ -25,5 +25,5 @@ featuresRepositories=mvn:org.apache.kara
#
# Comma separated list of features to install at startup
#
-featuresBoot=karaf-framework,config,activemq-broker,jaxrs-api,core,camel,camel-cxf,camel-blueprint,war
+featuresBoot=karaf-framework,config,activemq-broker,jaxrs-api,camel,camel-cxf,camel-blueprint,war
Modified: servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml?rev=1568023&r1=1568022&r2=1568023&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml Thu Feb 13 20:07:25 2014
@@ -21,19 +21,6 @@
<repository>mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features</repository>
<repository>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</repository>
- <feature name="core" version="${project.version}" resolver="(obr)" start-level="30">
- <feature version="${camel.version}">camel</feature>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.scala-library/${scala.bundle.version}</bundle>
- <bundle>mvn:org.apache.servicemix.core/camel/${project.version}</bundle>
- </feature>
-
- <feature name="audit-mongodb" version="${project.version}" resolver="(obr)" start-level="30">
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.scala-library/${scala.bundle.version}</bundle>
- <bundle dependency="true">mvn:org.mongodb/mongo-java-driver/${mongodb.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.casbah/${casbah.bundle.version}</bundle>
- <bundle>mvn:org.apache.servicemix.audit/mongodb/${project.version}</bundle>
- </feature>
-
<feature name="connector" version="${version}" resolver="(obr)" start-level='50'>
<feature version="${aries.transaction.version}">transaction</feature>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo-j2ee-connector.version}</bundle>
Modified: servicemix/smx5/trunk/assemblies/shared/src/main/filtered-resources/startup-obr.properties
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/shared/src/main/filtered-resources/startup-obr.properties?rev=1568023&r1=1568022&r2=1568023&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/shared/src/main/filtered-resources/startup-obr.properties (original)
+++ servicemix/smx5/trunk/assemblies/shared/src/main/filtered-resources/startup-obr.properties Thu Feb 13 20:07:25 2014
@@ -1,9 +1,4 @@
# enabling features OBR resolver support
org/apache/felix/org.apache.felix.bundlerepository/${felix.obr.version}/org.apache.felix.bundlerepository-${felix.obr.version}.jar=10
-org/apache/karaf/features/org.apache.karaf.features.obr/${karaf.version}/org.apache.karaf.features.obr-${karaf.version}.jar=30
-
-# adding support for the global management of Camel routes
-org/apache/servicemix/bundles/org.apache.servicemix.bundles.scala-library/${scala.bundle.version}/org.apache.servicemix.bundles.scala-library-${scala.bundle.version}.jar=30
-org/apache/camel/camel-core/${camel.version}/camel-core-${camel.version}.jar=30
-org/apache/servicemix/core/camel/${project.version}/camel-${project.version}.jar=30
+org/apache/karaf/features/org.apache.karaf.features.obr/${karaf.version}/org.apache.karaf.features.obr-${karaf.version}.jar=30
\ No newline at end of file
Modified: servicemix/smx5/trunk/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/itests/pom.xml?rev=1568023&r1=1568022&r2=1568023&view=diff
==============================================================================
--- servicemix/smx5/trunk/itests/pom.xml (original)
+++ servicemix/smx5/trunk/itests/pom.xml Thu Feb 13 20:07:25 2014
@@ -149,6 +149,8 @@
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${settings.localRepository}</argLine>
+ <!-- SM-2232: hangs in integration tests -->
+ <skipExec>true</skipExec>
</configuration>
</plugin>
Modified: servicemix/smx5/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/pom.xml?rev=1568023&r1=1568022&r2=1568023&view=diff
==============================================================================
--- servicemix/smx5/trunk/pom.xml (original)
+++ servicemix/smx5/trunk/pom.xml Thu Feb 13 20:07:25 2014
@@ -37,9 +37,7 @@
<modules>
<module>parent</module>
- <module>core</module>
<module>activiti</module>
- <module>audit</module>
<module>akka</module>
<module>branding</module>
<module>logging</module>
@@ -56,7 +54,7 @@
<issueManagement>
<system>jira</system>
- <url>http://issues.apache.org/jira/browse/SMX4</url>
+ <url>http://issues.apache.org/jira/browse/SM</url>
</issueManagement>
<prerequisites>