servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r1393470 - in /servicemix/smx4/features/trunk: ./ assemblies/apache-servicemix/src/main/filtered-resources/ assemblies/shared/ logging/ logging/jms-appender/ logging/jms-appender/src/ logging/jms-appender/src/main/ logging/jms-appender/src/...
Date Wed, 03 Oct 2012 13:04:22 GMT
Author: gertv
Date: Wed Oct  3 13:04:20 2012
New Revision: 1393470

URL: http://svn.apache.org/viewvc?rev=1393470&view=rev
Log:
SMX4-1205: Some cleanup and renaming of modules in the log appender

Added:
    servicemix/smx4/features/trunk/logging/
    servicemix/smx4/features/trunk/logging/jms-appender/
    servicemix/smx4/features/trunk/logging/jms-appender/README.txt
      - copied, changed from r1393452, servicemix/smx4/features/trunk/osgi-logging/jms-appender/README.txt
    servicemix/smx4/features/trunk/logging/jms-appender/pom.xml
      - copied, changed from r1393452, servicemix/smx4/features/trunk/osgi-logging/jms-appender/pom.xml
    servicemix/smx4/features/trunk/logging/jms-appender/src/
    servicemix/smx4/features/trunk/logging/jms-appender/src/main/
    servicemix/smx4/features/trunk/logging/jms-appender/src/main/java/
    servicemix/smx4/features/trunk/logging/jms-appender/src/main/java/org/
    servicemix/smx4/features/trunk/logging/jms-appender/src/main/java/org/apache/
    servicemix/smx4/features/trunk/logging/jms-appender/src/main/java/org/apache/servicemix/
    servicemix/smx4/features/trunk/logging/jms-appender/src/main/java/org/apache/servicemix/logging/
    servicemix/smx4/features/trunk/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/
    servicemix/smx4/features/trunk/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/DefaultLoggingEventFormat.java
      - copied, changed from r1393452, servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/DefaultLoggingEventFormat.java
    servicemix/smx4/features/trunk/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/JMSAppender.java
      - copied, changed from r1393452, servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/JMSAppender.java
    servicemix/smx4/features/trunk/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/LoggingEventFormat.java
      - copied, changed from r1393452, servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/LoggingEventFormat.java
    servicemix/smx4/features/trunk/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/LogstashEventFormat.java
      - copied, changed from r1393452, servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/LogstashEventFormat.java
    servicemix/smx4/features/trunk/logging/jms-appender/src/main/resources/
    servicemix/smx4/features/trunk/logging/jms-appender/src/main/resources/OSGI-INF/
    servicemix/smx4/features/trunk/logging/jms-appender/src/main/resources/OSGI-INF/blueprint/
    servicemix/smx4/features/trunk/logging/jms-appender/src/main/resources/OSGI-INF/blueprint/config.xml
      - copied, changed from r1393452, servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/main/resources/OSGI-INF/blueprint/config.xml
    servicemix/smx4/features/trunk/logging/jms-appender/src/test/
    servicemix/smx4/features/trunk/logging/jms-appender/src/test/java/
    servicemix/smx4/features/trunk/logging/jms-appender/src/test/java/org/
    servicemix/smx4/features/trunk/logging/jms-appender/src/test/java/org/apache/
    servicemix/smx4/features/trunk/logging/jms-appender/src/test/java/org/apache/servicemix/
    servicemix/smx4/features/trunk/logging/jms-appender/src/test/java/org/apache/servicemix/logging/
    servicemix/smx4/features/trunk/logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/
    servicemix/smx4/features/trunk/logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/JMSAppenderTest.java
      - copied, changed from r1393452, servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/JMSAppenderTest.java
    servicemix/smx4/features/trunk/logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/LogstashEventFormatTest.java
      - copied, changed from r1393452, servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/LogstashEventFormatTest.java
    servicemix/smx4/features/trunk/logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/MockEvents.java
      - copied, changed from r1393452, servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/MockEvents.java
    servicemix/smx4/features/trunk/logging/jms-appender/src/test/resources/
    servicemix/smx4/features/trunk/logging/jms-appender/src/test/resources/log4j.properties
      - copied, changed from r1393452, servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/test/resources/log4j.properties
    servicemix/smx4/features/trunk/logging/pom.xml
      - copied, changed from r1393452, servicemix/smx4/features/trunk/osgi-logging/pom.xml
Removed:
    servicemix/smx4/features/trunk/osgi-logging/jms-appender/README.txt
    servicemix/smx4/features/trunk/osgi-logging/jms-appender/pom.xml
    servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/DefaultLoggingEventFormat.java
    servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/JMSAppender.java
    servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/LoggingEventFormat.java
    servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/LogstashEventFormat.java
    servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/main/resources/OSGI-INF/blueprint/config.xml
    servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/JMSAppenderTest.java
    servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/LogstashEventFormatTest.java
    servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/MockEvents.java
    servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/test/resources/log4j.properties
    servicemix/smx4/features/trunk/osgi-logging/pom.xml
Modified:
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
    servicemix/smx4/features/trunk/assemblies/shared/pom.xml
    servicemix/smx4/features/trunk/pom.xml

Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml?rev=1393470&r1=1393469&r2=1393470&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
(original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
Wed Oct  3 13:04:20 2012
@@ -317,7 +317,7 @@
 
     <feature name="jms-appender" version="${version}" resolver="(obr)" start-level="50">
         <feature version="${version}">activemq-broker</feature>
-        <bundle>mvn:org.apache.servicemix.logging/pax-jms-appender/${version}</bundle>
+        <bundle>mvn:org.apache.servicemix.logging/jms-appender/${version}</bundle>
     </feature>
 
     <!-- Activiti support -->

Modified: servicemix/smx4/features/trunk/assemblies/shared/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/pom.xml?rev=1393470&r1=1393469&r2=1393470&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/shared/pom.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/shared/pom.xml Wed Oct  3 13:04:20 2012
@@ -51,10 +51,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.activator</artifactId>
         </dependency>
     </dependencies>

Copied: servicemix/smx4/features/trunk/logging/jms-appender/README.txt (from r1393452, servicemix/smx4/features/trunk/osgi-logging/jms-appender/README.txt)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/logging/jms-appender/README.txt?p2=servicemix/smx4/features/trunk/logging/jms-appender/README.txt&p1=servicemix/smx4/features/trunk/osgi-logging/jms-appender/README.txt&r1=1393452&r2=1393470&rev=1393470&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/logging/jms-appender/pom.xml (from r1393452, servicemix/smx4/features/trunk/osgi-logging/jms-appender/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/logging/jms-appender/pom.xml?p2=servicemix/smx4/features/trunk/logging/jms-appender/pom.xml&p1=servicemix/smx4/features/trunk/osgi-logging/jms-appender/pom.xml&r1=1393452&r2=1393470&rev=1393470&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/osgi-logging/jms-appender/pom.xml (original)
+++ servicemix/smx4/features/trunk/logging/jms-appender/pom.xml Wed Oct  3 13:04:20 2012
@@ -24,12 +24,12 @@
 
     <parent>
         <groupId>org.apache.servicemix.logging</groupId>
-        <artifactId>osgi-logging</artifactId>
+        <artifactId>logging</artifactId>
         <version>4.5.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>pax-jms-appender</artifactId>
-    <name>Apache ServiceMix :: Features :: Pax Logging Support :: JMS Appender</name>
+    <artifactId>jms-appender</artifactId>
+    <name>Apache ServiceMix :: Features :: Logging :: JMS Appender</name>
 
     <packaging>bundle</packaging>
 
@@ -80,7 +80,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Import-Package>
                             *
                         </Import-Package>

Copied: servicemix/smx4/features/trunk/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/DefaultLoggingEventFormat.java
(from r1393452, servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/DefaultLoggingEventFormat.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/DefaultLoggingEventFormat.java?p2=servicemix/smx4/features/trunk/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/DefaultLoggingEventFormat.java&p1=servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/DefaultLoggingEventFormat.java&r1=1393452&r2=1393470&rev=1393470&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/JMSAppender.java
(from r1393452, servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/JMSAppender.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/JMSAppender.java?p2=servicemix/smx4/features/trunk/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/JMSAppender.java&p1=servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/JMSAppender.java&r1=1393452&r2=1393470&rev=1393470&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/LoggingEventFormat.java
(from r1393452, servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/LoggingEventFormat.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/LoggingEventFormat.java?p2=servicemix/smx4/features/trunk/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/LoggingEventFormat.java&p1=servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/LoggingEventFormat.java&r1=1393452&r2=1393470&rev=1393470&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/LogstashEventFormat.java
(from r1393452, servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/LogstashEventFormat.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/LogstashEventFormat.java?p2=servicemix/smx4/features/trunk/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/LogstashEventFormat.java&p1=servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/LogstashEventFormat.java&r1=1393452&r2=1393470&rev=1393470&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/logging/jms-appender/src/main/resources/OSGI-INF/blueprint/config.xml
(from r1393452, servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/main/resources/OSGI-INF/blueprint/config.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/logging/jms-appender/src/main/resources/OSGI-INF/blueprint/config.xml?p2=servicemix/smx4/features/trunk/logging/jms-appender/src/main/resources/OSGI-INF/blueprint/config.xml&p1=servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/main/resources/OSGI-INF/blueprint/config.xml&r1=1393452&r2=1393470&rev=1393470&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/JMSAppenderTest.java
(from r1393452, servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/JMSAppenderTest.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/JMSAppenderTest.java?p2=servicemix/smx4/features/trunk/logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/JMSAppenderTest.java&p1=servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/JMSAppenderTest.java&r1=1393452&r2=1393470&rev=1393470&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/LogstashEventFormatTest.java
(from r1393452, servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/LogstashEventFormatTest.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/LogstashEventFormatTest.java?p2=servicemix/smx4/features/trunk/logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/LogstashEventFormatTest.java&p1=servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/LogstashEventFormatTest.java&r1=1393452&r2=1393470&rev=1393470&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/MockEvents.java
(from r1393452, servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/MockEvents.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/MockEvents.java?p2=servicemix/smx4/features/trunk/logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/MockEvents.java&p1=servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/MockEvents.java&r1=1393452&r2=1393470&rev=1393470&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/logging/jms-appender/src/test/resources/log4j.properties
(from r1393452, servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/test/resources/log4j.properties)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/logging/jms-appender/src/test/resources/log4j.properties?p2=servicemix/smx4/features/trunk/logging/jms-appender/src/test/resources/log4j.properties&p1=servicemix/smx4/features/trunk/osgi-logging/jms-appender/src/test/resources/log4j.properties&r1=1393452&r2=1393470&rev=1393470&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/features/trunk/logging/pom.xml (from r1393452, servicemix/smx4/features/trunk/osgi-logging/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/logging/pom.xml?p2=servicemix/smx4/features/trunk/logging/pom.xml&p1=servicemix/smx4/features/trunk/osgi-logging/pom.xml&r1=1393452&r2=1393470&rev=1393470&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/osgi-logging/pom.xml (original)
+++ servicemix/smx4/features/trunk/logging/pom.xml Wed Oct  3 13:04:20 2012
@@ -28,9 +28,9 @@
     </parent>
 
     <groupId>org.apache.servicemix.logging</groupId>
-    <artifactId>osgi-logging</artifactId>
+    <artifactId>logging</artifactId>
     <packaging>pom</packaging>
-    <name>Apache ServiceMix :: Features :: Pax Logging Support</name>
+    <name>Apache ServiceMix :: Features :: Logging</name>
 
     <modules>
         <module>jms-appender</module>

Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1393470&r1=1393469&r2=1393470&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Wed Oct  3 13:04:20 2012
@@ -40,7 +40,7 @@
         <module>activiti</module>
         <module>branding</module>
         <module>camel</module>
-        <module>osgi-logging</module>
+        <module>logging</module>
         <module>cxf</module>
         <module>examples</module>
         <module>itests</module>



Mime
View raw message