You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/01/12 08:54:49 UTC
svn commit: r1230432 - in /karaf/eik/trunk/plugins/org.ops4j.pax.url.mvn: ./
META-INF/ lib/ src/main/java/ src/main/java/org/ops4j/pax/url/mvn/
Author: jbonofre
Date: Thu Jan 12 07:54:49 2012
New Revision: 1230432
URL: http://svn.apache.org/viewvc?rev=1230432&view=rev
Log:
Refactoring of Pax URL MVN Eclipse Plugin wrapper
Removed:
karaf/eik/trunk/plugins/org.ops4j.pax.url.mvn/lib/pax-url-aether-1.3.2-sources.jar
karaf/eik/trunk/plugins/org.ops4j.pax.url.mvn/lib/pax-url-aether-1.3.2.jar
karaf/eik/trunk/plugins/org.ops4j.pax.url.mvn/src/main/java/.sentry
karaf/eik/trunk/plugins/org.ops4j.pax.url.mvn/src/main/java/org/ops4j/pax/url/mvn/MvnURLConnectionFactory.java
Modified:
karaf/eik/trunk/plugins/org.ops4j.pax.url.mvn/META-INF/MANIFEST.MF
karaf/eik/trunk/plugins/org.ops4j.pax.url.mvn/build.properties
karaf/eik/trunk/plugins/org.ops4j.pax.url.mvn/pom.xml
Modified: karaf/eik/trunk/plugins/org.ops4j.pax.url.mvn/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.ops4j.pax.url.mvn/META-INF/MANIFEST.MF?rev=1230432&r1=1230431&r2=1230432&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.ops4j.pax.url.mvn/META-INF/MANIFEST.MF (original)
+++ karaf/eik/trunk/plugins/org.ops4j.pax.url.mvn/META-INF/MANIFEST.MF Thu Jan 12 07:54:49 2012
@@ -1,36 +1,27 @@
-Bnd-LastModified: 1302269290941
-Build-Jdk: 1.6.0_24
-Built-By: tonit
-Bundle-Activator: org.ops4j.pax.url.mvn.internal.Activator
-Bundle-Description: OPS4J Pax Url - aether: protocol handler. Detailed information to be found at http://wiki.ops4j.org/confluence/x/CoA6.
-Bundle-DocURL: http://www.ops4j.org/
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.html
-Bundle-ManifestVersion: 2
-Bundle-Name: OPS4J Pax Url - aether
-Bundle-SymbolicName: org.ops4j.pax.url.mvn;singleton:=true
-Bundle-Vendor: OPS4J - Open Participation Software for Java
-Bundle-Version: 1.3.2.qualifier
-Created-By: Apache Maven Bundle Plugin
-Export-Package: org.ops4j.pax.url.mvn;version="1.3.2"
-Export-Service: org.osgi.service.url.URLStreamHandlerService; url.handler.protocol=aether
-Ignore-Package: junit.framework,org.cyberneko.html,org.cyberneko.html.filters,com.sun.jdmk.comm,javax.jms,javax.mail,javax.mail.internet,javax.swing,javax.swing.border,javax.swing.event,javax.swing.table,javax.swing.text,javax.swing.tree,javax.management,javax.crypto,javax.crypto.spec,org.apache.avalon.framework.logger,org.apache.log,org.apache.xerces.xni,org.apache.xerces.xni.parser,org.objectweb.asm,org.objectweb.asm.commons
-Import-Package: javax.annotation,
- javax.naming,
- javax.net,
- javax.net.ssl,
- javax.xml.parsers,
- org.apache.commons.logging;version="1.0.4";resolution:=optional,
- org.apache.log4j,
- org.ops4j.pax.url.mvn;version="1.3.2",
- org.osgi.framework;version="[1.0.0,2.0.0)",
- org.osgi.service.cm;version="[1.0.0,2.0.0)";resolution:=optional,
- org.osgi.service.url;version="[1.0.0,2.0.0)",
- org.slf4j,
- org.w3c.dom,
- org.xml.sax,
- org.xml.sax.helpers
Manifest-Version: 1.0
+Export-Package: org.ops4j.pax.url.mvn;version="1.2.8"
+Built-By: jbonofre
Tool: Bnd-0.0.357
+Bundle-Name: OPS4J Pax Url - mvn:
+Created-By: Apache Maven Bundle Plugin
+Export-Service: org.osgi.service.url.URLStreamHandlerService; url.hand
+ ler.protocol=mvn
+Bundle-Vendor: OPS4J - Open Participation Software for Java
+Build-Jdk: 1.6.0_26
+Bundle-Version: 1.2.8
+Bnd-LastModified: 1312812825388
+Bundle-Activator: org.ops4j.pax.url.mvn.internal.Activator
+Bundle-ManifestVersion: 2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.html
+Bundle-Description: OPS4J Pax Url - mvn: protocol handler. Detailed
+ information to be found at http://wiki.ops4j.org/confluence/x/CoA6.
+Bundle-DocURL: http://www.ops4j.org/
+Bundle-SymbolicName: org.ops4j.pax.url.mvn; singleton:=true
+Import-Package: javax.net.ssl,javax.xml.parsers,org.apache.commons.log
+ ging;version="1.0.4";resolution:=optional,org.ops4j.pax.url.mvn;versi
+ on="1.2.8",org.osgi.framework;version="[1.0.0,2.0.0)",org.osgi.servic
+ e.cm;resolution:=optional;version="[1.0.0,2.0.0)",org.osgi.service.ur
+ l;version="[1.0.0,2.0.0)",org.w3c.dom,org.xml.sax
Bundle-ClassPath: .,
- lib/pax-url-aether-1.3.2.jar
+ lib/pax-url-mvn-1.2.8.jar
Bundle-ActivationPolicy: lazy
Modified: karaf/eik/trunk/plugins/org.ops4j.pax.url.mvn/build.properties
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.ops4j.pax.url.mvn/build.properties?rev=1230432&r1=1230431&r2=1230432&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.ops4j.pax.url.mvn/build.properties (original)
+++ karaf/eik/trunk/plugins/org.ops4j.pax.url.mvn/build.properties Thu Jan 12 07:54:49 2012
@@ -1,8 +1,8 @@
source.. = src/main/java/
src.includes = src/,\
- lib/pax-url-aether-1.3.2-sources.jar
+ lib/pax-url-mvn-1.2.8-sources.jar
bin.includes = META-INF/,\
.,\
lib/,\
- lib/pax-url-aether-1.3.2.jar
-bin.excludes = lib/pax-url-aether-1.3.2-sources.jar
+ lib/pax-url-mvn-1.2.8.jar
+bin.excludes = lib/pax-url-mvn-1.2.8-sources.jar
Modified: karaf/eik/trunk/plugins/org.ops4j.pax.url.mvn/pom.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.ops4j.pax.url.mvn/pom.xml?rev=1230432&r1=1230431&r2=1230432&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.ops4j.pax.url.mvn/pom.xml (original)
+++ karaf/eik/trunk/plugins/org.ops4j.pax.url.mvn/pom.xml Thu Jan 12 07:54:49 2012
@@ -30,34 +30,84 @@
<groupId>org.apache.karaf.eik.plugins</groupId>
<artifactId>org.ops4j.pax.url.mvn</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>1.2.8</version>
<packaging>eclipse-plugin</packaging>
<name>Apache Karaf :: EIK :: Plugins :: PAX URL MVN Wrapper</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-mvn</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-mvn</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ </dependencies>
+
<build>
<resources>
<resource>
- <directory>${pom.basedir}</directory>
+ <directory>${project.basedir}</directory>
<includes>
<include>lib/**/*.jar</include>
</includes>
</resource>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
</resources>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-mvn</artifactId>
+ <version>${project.version}</version>
+ <outputDirectory>lib</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-mvn</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ <outputDirectory>lib</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
- <manifestFile>${pom.basedir}/META-INF/MANIFEST.MF</manifestFile>
+ <manifestFile>${project.basedir}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>lib</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
</plugins>
</build>