servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1179941 - in /servicemix/smx4/bundles/trunk: ./ javassist-3.12.0.GA/ javassist-3.12.0.GA/src/ javassist-3.12.0.GA/src/main/ javassist-3.12.0.GA/src/main/resources/ javassist-3.12.0.GA/src/main/resources/OSGI-INF/ javassist-3.12.1.GA/ javas...
Date Fri, 07 Oct 2011 06:07:54 GMT
Author: jbonofre
Date: Fri Oct  7 06:07:54 2011
New Revision: 1179941

URL: http://svn.apache.org/viewvc?rev=1179941&view=rev
Log:
[SMX4-937] Add OSGi bundle for OGNL 3.0.2 and cleanup Javassist bundles.

Added:
    servicemix/smx4/bundles/trunk/javassist-3.12.0.GA/
    servicemix/smx4/bundles/trunk/javassist-3.12.0.GA/pom.xml
      - copied, changed from r1179352, servicemix/smx4/bundles/trunk/javassist-3.12.ga/pom.xml
    servicemix/smx4/bundles/trunk/javassist-3.12.0.GA/src/
    servicemix/smx4/bundles/trunk/javassist-3.12.0.GA/src/main/
    servicemix/smx4/bundles/trunk/javassist-3.12.0.GA/src/main/resources/
    servicemix/smx4/bundles/trunk/javassist-3.12.0.GA/src/main/resources/OSGI-INF/
    servicemix/smx4/bundles/trunk/javassist-3.12.0.GA/src/main/resources/OSGI-INF/bundle.info
      - copied, changed from r1179352, servicemix/smx4/bundles/trunk/javassist-3.12.ga/src/main/resources/OSGI-INF/bundle.info
    servicemix/smx4/bundles/trunk/javassist-3.12.1.GA/
    servicemix/smx4/bundles/trunk/javassist-3.12.1.GA/pom.xml
      - copied, changed from r1179352, servicemix/smx4/bundles/trunk/javassist-3.12.ga/pom.xml
    servicemix/smx4/bundles/trunk/javassist-3.12.1.GA/src/
    servicemix/smx4/bundles/trunk/javassist-3.12.1.GA/src/main/
    servicemix/smx4/bundles/trunk/javassist-3.12.1.GA/src/main/resources/
    servicemix/smx4/bundles/trunk/javassist-3.12.1.GA/src/main/resources/OSGI-INF/
    servicemix/smx4/bundles/trunk/javassist-3.12.1.GA/src/main/resources/OSGI-INF/bundle.info
      - copied, changed from r1179352, servicemix/smx4/bundles/trunk/javassist-3.12.ga/src/main/resources/OSGI-INF/bundle.info
    servicemix/smx4/bundles/trunk/ognl-3.0.2/
    servicemix/smx4/bundles/trunk/ognl-3.0.2/pom.xml
      - copied, changed from r1179352, servicemix/smx4/bundles/trunk/javassist-3.12.ga/pom.xml
    servicemix/smx4/bundles/trunk/ognl-3.0.2/src/
    servicemix/smx4/bundles/trunk/ognl-3.0.2/src/main/
    servicemix/smx4/bundles/trunk/ognl-3.0.2/src/main/resources/
    servicemix/smx4/bundles/trunk/ognl-3.0.2/src/main/resources/OSGI-INF/
    servicemix/smx4/bundles/trunk/ognl-3.0.2/src/main/resources/OSGI-INF/bundle.info
Removed:
    servicemix/smx4/bundles/trunk/javassist-3.12.ga/pom.xml
    servicemix/smx4/bundles/trunk/javassist-3.12.ga/src/main/resources/OSGI-INF/bundle.info
Modified:
    servicemix/smx4/bundles/trunk/pom.xml

Copied: servicemix/smx4/bundles/trunk/javassist-3.12.0.GA/pom.xml (from r1179352, servicemix/smx4/bundles/trunk/javassist-3.12.ga/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/javassist-3.12.0.GA/pom.xml?p2=servicemix/smx4/bundles/trunk/javassist-3.12.0.GA/pom.xml&p1=servicemix/smx4/bundles/trunk/javassist-3.12.ga/pom.xml&r1=1179352&r2=1179941&rev=1179941&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/javassist-3.12.ga/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/javassist-3.12.0.GA/pom.xml Fri Oct  7 06:07:54 2011
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -18,23 +18,23 @@
         See the License for the specific language governing permissions and
         limitations under the License.
     -->
-    
+
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
         <version>6</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
-    
+
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
-    <version>3.12.1.ga_2-SNAPSHOT</version>
+    <version>3.12.0.GA_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
-    
+
     <properties>
         <pkgGroupId>javassist</pkgGroupId>
         <pkgArtifactId>javassist</pkgArtifactId>
@@ -48,20 +48,15 @@
             *
         </servicemix.osgi.import.pkg>
     </properties>
-   
+
     <repositories>
         <repository>
-            <id>jboss</id>
-            <name>New JBoss Maven2 Repository</name>
-            <url>http://repository.jboss.org/maven2-brew/</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
+            <id>jboss.m2</id>
+            <name>JBoss Maven2 Repository</name>
+            <url>http://repository.jboss.org/maven2</url>
         </repository>
-    </repositories> 
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
@@ -70,7 +65,7 @@
             <optional>true</optional>
         </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -96,8 +91,6 @@
                                     </excludes>
                                 </filter>
                             </filters>
-                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
                         </configuration>
                     </execution>
                 </executions>

Copied: servicemix/smx4/bundles/trunk/javassist-3.12.0.GA/src/main/resources/OSGI-INF/bundle.info
(from r1179352, servicemix/smx4/bundles/trunk/javassist-3.12.ga/src/main/resources/OSGI-INF/bundle.info)
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/javassist-3.12.0.GA/src/main/resources/OSGI-INF/bundle.info?p2=servicemix/smx4/bundles/trunk/javassist-3.12.0.GA/src/main/resources/OSGI-INF/bundle.info&p1=servicemix/smx4/bundles/trunk/javassist-3.12.ga/src/main/resources/OSGI-INF/bundle.info&r1=1179352&r2=1179941&rev=1179941&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/javassist-3.12.ga/src/main/resources/OSGI-INF/bundle.info
(original)
+++ servicemix/smx4/bundles/trunk/javassist-3.12.0.GA/src/main/resources/OSGI-INF/bundle.info
Fri Oct  7 06:07:54 2011
@@ -2,7 +2,7 @@
     ${project.description}
 
     Original Maven URL:
-        \u001B[33mmvn:http://repository.jboss.org/maven2-brew/:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
+        \u001B[33mmvn:http://repository.jboss.org/maven2:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
 
 \u001B[1mDESCRIPTION\u001B[0m
 	Javassist (Java Programming Assistant) makes Java bytecode manipulation

Copied: servicemix/smx4/bundles/trunk/javassist-3.12.1.GA/pom.xml (from r1179352, servicemix/smx4/bundles/trunk/javassist-3.12.ga/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/javassist-3.12.1.GA/pom.xml?p2=servicemix/smx4/bundles/trunk/javassist-3.12.1.GA/pom.xml&p1=servicemix/smx4/bundles/trunk/javassist-3.12.ga/pom.xml&r1=1179352&r2=1179941&rev=1179941&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/javassist-3.12.ga/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/javassist-3.12.1.GA/pom.xml Fri Oct  7 06:07:54 2011
@@ -30,7 +30,7 @@
     
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
-    <version>3.12.1.ga_2-SNAPSHOT</version>
+    <version>3.12.1.GA_2-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
@@ -38,7 +38,7 @@
     <properties>
         <pkgGroupId>javassist</pkgGroupId>
         <pkgArtifactId>javassist</pkgArtifactId>
-        <pkgVersion>3.12.0.GA</pkgVersion>
+        <pkgVersion>3.12.1.GA</pkgVersion>
         <servicemix.osgi.export.pkg>
             javassist
         </servicemix.osgi.export.pkg>

Copied: servicemix/smx4/bundles/trunk/javassist-3.12.1.GA/src/main/resources/OSGI-INF/bundle.info
(from r1179352, servicemix/smx4/bundles/trunk/javassist-3.12.ga/src/main/resources/OSGI-INF/bundle.info)
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/javassist-3.12.1.GA/src/main/resources/OSGI-INF/bundle.info?p2=servicemix/smx4/bundles/trunk/javassist-3.12.1.GA/src/main/resources/OSGI-INF/bundle.info&p1=servicemix/smx4/bundles/trunk/javassist-3.12.ga/src/main/resources/OSGI-INF/bundle.info&r1=1179352&r2=1179941&rev=1179941&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/bundles/trunk/ognl-3.0.2/pom.xml (from r1179352, servicemix/smx4/bundles/trunk/javassist-3.12.ga/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/ognl-3.0.2/pom.xml?p2=servicemix/smx4/bundles/trunk/ognl-3.0.2/pom.xml&p1=servicemix/smx4/bundles/trunk/javassist-3.12.ga/pom.xml&r1=1179352&r2=1179941&rev=1179941&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/javassist-3.12.ga/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/ognl-3.0.2/pom.xml Fri Oct  7 06:07:54 2011
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <!--
@@ -18,50 +17,37 @@
         See the License for the specific language governing permissions and
         limitations under the License.
     -->
-    
+
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
         <version>6</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
-    
+
     <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
-    <version>3.12.1.ga_2-SNAPSHOT</version>
+    <artifactId>org.apache.servicemix.bundles.ognl</artifactId>
+    <version>3.0.2_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
-    <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
-    
+    <description>This OSGi bundles wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
+
     <properties>
-        <pkgGroupId>javassist</pkgGroupId>
-        <pkgArtifactId>javassist</pkgArtifactId>
-        <pkgVersion>3.12.0.GA</pkgVersion>
+        <pkgGroupId>ognl</pkgGroupId>
+        <pkgArtifactId>ognl</pkgArtifactId>
+        <pkgVersion>3.0.2</pkgVersion>
         <servicemix.osgi.export.pkg>
-            javassist
+            ognl
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !javassist*,
-            com.sun.jdi*;resolution:=optional,
+            !ognl*,
+            javassist*;version="[3.11,4)",
             *
         </servicemix.osgi.import.pkg>
     </properties>
-   
-    <repositories>
-        <repository>
-            <id>jboss</id>
-            <name>New JBoss Maven2 Repository</name>
-            <url>http://repository.jboss.org/maven2-brew/</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories> 
+
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
@@ -70,7 +56,7 @@
             <optional>true</optional>
         </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>

Added: servicemix/smx4/bundles/trunk/ognl-3.0.2/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/ognl-3.0.2/src/main/resources/OSGI-INF/bundle.info?rev=1179941&view=auto
==============================================================================
--- servicemix/smx4/bundles/trunk/ognl-3.0.2/src/main/resources/OSGI-INF/bundle.info (added)
+++ servicemix/smx4/bundles/trunk/ognl-3.0.2/src/main/resources/OSGI-INF/bundle.info Fri Oct
 7 06:07:54 2011
@@ -0,0 +1,17 @@
+\u001B[1mSYNOPSIS\u001B[0m
+    ${project.description}
+
+    Original Maven URL:
+        \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+    OGNL stands for Object-Graph Navigation Language; it is an expression language for getting
and setting properties
+    of Java objects. You use the same expression for both getting and setting the value of
a property.
+
+    The ognl.Ognl class contains convenience methods for evaluating OGNL expressions. You
can do this in two stages,
+    parsing an expression into an internal form and then using that internal form to either
set or get the value of a
+    property; or you can do it in a single stage, and get or set a property using the String
form of the expression
+    directly.
+
+ \u001B[1mSEE ALSO\u001B[0m
+    \u001B[36mhttp://www.opensymphony.com/ognl/\u001B[0m

Modified: servicemix/smx4/bundles/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=1179941&r1=1179940&r2=1179941&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Fri Oct  7 06:07:54 2011
@@ -43,6 +43,9 @@
     <modules>
         <module>cometd-java-server-2.3.1</module>
         <module>antlr-runtime-3.4</module>
+        <module>ognl-3.0.2</module>
+        <module>javassist-3.12.0.GA</module>
+        <module>javassist-3.12.1.GA</module>
     </modules>
 
 </project>



Mime
View raw message