You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/09/11 16:23:23 UTC
svn commit: r694271 - in /servicemix/m2-repo/org/mortbay/jetty:
jetty-client/6.1.12-rc1/ jetty-client/6.1.12rc1-smx/
jetty-client/6.1.12rc1/ jetty-management/6.1.12-rc1/
jetty-management/6.1.12rc1-smx/ jetty-sslengine/6.1.12-rc1/
jetty-sslengine/6.1.12...
Author: gnodet
Date: Thu Sep 11 07:23:22 2008
New Revision: 694271
URL: http://svn.apache.org/viewvc?rev=694271&view=rev
Log:
Repackage jetty bundles once more
Added:
servicemix/m2-repo/org/mortbay/jetty/jetty-client/6.1.12rc1-smx/
servicemix/m2-repo/org/mortbay/jetty/jetty-client/6.1.12rc1-smx/jetty-client-6.1.12rc1-smx.jar
- copied unchanged from r694144, servicemix/m2-repo/org/mortbay/jetty/jetty-client/6.1.12-rc1/jetty-client-6.1.12-rc1.jar
servicemix/m2-repo/org/mortbay/jetty/jetty-client/6.1.12rc1-smx/jetty-client-6.1.12rc1-smx.pom
- copied, changed from r694144, servicemix/m2-repo/org/mortbay/jetty/jetty-client/6.1.12-rc1/jetty-client-6.1.12-rc1.pom
servicemix/m2-repo/org/mortbay/jetty/jetty-management/6.1.12rc1-smx/
servicemix/m2-repo/org/mortbay/jetty/jetty-management/6.1.12rc1-smx/jetty-management-6.1.12rc1-smx.jar
- copied unchanged from r694144, servicemix/m2-repo/org/mortbay/jetty/jetty-management/6.1.12-rc1/jetty-management-6.1.12-rc1.jar
servicemix/m2-repo/org/mortbay/jetty/jetty-management/6.1.12rc1-smx/jetty-management-6.1.12rc1-smx.pom
- copied, changed from r694144, servicemix/m2-repo/org/mortbay/jetty/jetty-management/6.1.12-rc1/jetty-management-6.1.12-rc1.pom
servicemix/m2-repo/org/mortbay/jetty/jetty-sslengine/6.1.12rc1-smx/
- copied from r694144, servicemix/m2-repo/org/mortbay/jetty/jetty-sslengine/6.1.12-rc1/
servicemix/m2-repo/org/mortbay/jetty/jetty-sslengine/6.1.12rc1-smx/jetty-sslengine-6.1.12rc1-smx.jar (with props)
servicemix/m2-repo/org/mortbay/jetty/jetty-sslengine/6.1.12rc1-smx/jetty-sslengine-6.1.12rc1-smx.pom
servicemix/m2-repo/org/mortbay/jetty/jetty-util/6.1.12rc1-smx/
servicemix/m2-repo/org/mortbay/jetty/jetty-util/6.1.12rc1-smx/jetty-util-6.1.12rc1-smx.jar
- copied unchanged from r694144, servicemix/m2-repo/org/mortbay/jetty/jetty-util/6.1.12-rc1/jetty-util-6.1.12-rc1.jar
servicemix/m2-repo/org/mortbay/jetty/jetty-util/6.1.12rc1-smx/jetty-util-6.1.12rc1-smx.pom
- copied, changed from r694144, servicemix/m2-repo/org/mortbay/jetty/jetty-util/6.1.12-rc1/jetty-util-6.1.12-rc1.pom
servicemix/m2-repo/org/mortbay/jetty/jetty/6.1.12rc1-smx/
servicemix/m2-repo/org/mortbay/jetty/jetty/6.1.12rc1-smx/jetty-6.1.12rc1-smx.jar (with props)
servicemix/m2-repo/org/mortbay/jetty/jetty/6.1.12rc1-smx/jetty-6.1.12rc1-smx.pom
Removed:
servicemix/m2-repo/org/mortbay/jetty/jetty-client/6.1.12-rc1/jetty-client-6.1.12-rc1.jar
servicemix/m2-repo/org/mortbay/jetty/jetty-client/6.1.12-rc1/jetty-client-6.1.12-rc1.pom
servicemix/m2-repo/org/mortbay/jetty/jetty-client/6.1.12rc1/
servicemix/m2-repo/org/mortbay/jetty/jetty-management/6.1.12-rc1/
servicemix/m2-repo/org/mortbay/jetty/jetty-sslengine/6.1.12-rc1/
servicemix/m2-repo/org/mortbay/jetty/jetty-sslengine/6.1.12rc1/
servicemix/m2-repo/org/mortbay/jetty/jetty-sslengine/6.1.12rc1-smx/jetty-sslengine-6.1.12-rc1.jar
servicemix/m2-repo/org/mortbay/jetty/jetty-sslengine/6.1.12rc1-smx/jetty-sslengine-6.1.12-rc1.pom
servicemix/m2-repo/org/mortbay/jetty/jetty-util/6.1.12-rc1/jetty-util-6.1.12-rc1.jar
servicemix/m2-repo/org/mortbay/jetty/jetty-util/6.1.12-rc1/jetty-util-6.1.12-rc1.pom
servicemix/m2-repo/org/mortbay/jetty/jetty-util/6.1.12rc1/
servicemix/m2-repo/org/mortbay/jetty/jetty/6.1.12-rc1/
servicemix/m2-repo/org/mortbay/jetty/jetty/6.1.12rc1/
Copied: servicemix/m2-repo/org/mortbay/jetty/jetty-client/6.1.12rc1-smx/jetty-client-6.1.12rc1-smx.pom (from r694144, servicemix/m2-repo/org/mortbay/jetty/jetty-client/6.1.12-rc1/jetty-client-6.1.12-rc1.pom)
URL: http://svn.apache.org/viewvc/servicemix/m2-repo/org/mortbay/jetty/jetty-client/6.1.12rc1-smx/jetty-client-6.1.12rc1-smx.pom?p2=servicemix/m2-repo/org/mortbay/jetty/jetty-client/6.1.12rc1-smx/jetty-client-6.1.12rc1-smx.pom&p1=servicemix/m2-repo/org/mortbay/jetty/jetty-client/6.1.12-rc1/jetty-client-6.1.12-rc1.pom&r1=694144&r2=694271&rev=694271&view=diff
==============================================================================
--- servicemix/m2-repo/org/mortbay/jetty/jetty-client/6.1.12-rc1/jetty-client-6.1.12-rc1.pom (original)
+++ servicemix/m2-repo/org/mortbay/jetty/jetty-client/6.1.12rc1-smx/jetty-client-6.1.12rc1-smx.pom Thu Sep 11 07:23:22 2008
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-client</artifactId>
- <version>6.1.12-rc1</version>
+ <version>6.1.12rc1-smx</version>
<name>Jetty HTTP Client</name>
<url>http://jetty.mortbay.org</url>
<licenses>
Copied: servicemix/m2-repo/org/mortbay/jetty/jetty-management/6.1.12rc1-smx/jetty-management-6.1.12rc1-smx.pom (from r694144, servicemix/m2-repo/org/mortbay/jetty/jetty-management/6.1.12-rc1/jetty-management-6.1.12-rc1.pom)
URL: http://svn.apache.org/viewvc/servicemix/m2-repo/org/mortbay/jetty/jetty-management/6.1.12rc1-smx/jetty-management-6.1.12rc1-smx.pom?p2=servicemix/m2-repo/org/mortbay/jetty/jetty-management/6.1.12rc1-smx/jetty-management-6.1.12rc1-smx.pom&p1=servicemix/m2-repo/org/mortbay/jetty/jetty-management/6.1.12-rc1/jetty-management-6.1.12-rc1.pom&r1=694144&r2=694271&rev=694271&view=diff
==============================================================================
--- servicemix/m2-repo/org/mortbay/jetty/jetty-management/6.1.12-rc1/jetty-management-6.1.12-rc1.pom (original)
+++ servicemix/m2-repo/org/mortbay/jetty/jetty-management/6.1.12rc1-smx/jetty-management-6.1.12rc1-smx.pom Thu Sep 11 07:23:22 2008
@@ -8,7 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-management</artifactId>
- <version>6.1.12-rc1</version>
+ <version>6.1.12rc1-smx</version>
<name>Jetty Management</name>
<description>Jetty JMX</description>
<url>http://jetty.mortbay.org</url>
Added: servicemix/m2-repo/org/mortbay/jetty/jetty-sslengine/6.1.12rc1-smx/jetty-sslengine-6.1.12rc1-smx.jar
URL: http://svn.apache.org/viewvc/servicemix/m2-repo/org/mortbay/jetty/jetty-sslengine/6.1.12rc1-smx/jetty-sslengine-6.1.12rc1-smx.jar?rev=694271&view=auto
==============================================================================
Binary file - no diff available.
Propchange: servicemix/m2-repo/org/mortbay/jetty/jetty-sslengine/6.1.12rc1-smx/jetty-sslengine-6.1.12rc1-smx.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: servicemix/m2-repo/org/mortbay/jetty/jetty-sslengine/6.1.12rc1-smx/jetty-sslengine-6.1.12rc1-smx.pom
URL: http://svn.apache.org/viewvc/servicemix/m2-repo/org/mortbay/jetty/jetty-sslengine/6.1.12rc1-smx/jetty-sslengine-6.1.12rc1-smx.pom?rev=694271&view=auto
==============================================================================
--- servicemix/m2-repo/org/mortbay/jetty/jetty-sslengine/6.1.12rc1-smx/jetty-sslengine-6.1.12rc1-smx.pom (added)
+++ servicemix/m2-repo/org/mortbay/jetty/jetty-sslengine/6.1.12rc1-smx/jetty-sslengine-6.1.12rc1-smx.pom Thu Sep 11 07:23:22 2008
@@ -0,0 +1,107 @@
+<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">
+ <parent>
+ <artifactId>project</artifactId>
+ <groupId>org.mortbay.jetty</groupId>
+ <version>6.1.12rc1</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-sslengine</artifactId>
+ <version>6.1.12rc1-smx</version>
+ <name>Jetty SSLEngine</name>
+ <url>http://jetty.mortbay.org</url>
+ <licenses>
+ <license>
+ <name>Apache License Version 2</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+ </license>
+ </licenses>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copyfiles</id>
+ <phase>install</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <copy failonerror="false" file="target/${project.artifactId}-${project.version}.${project.packaging}" todir="../../lib/ext" />
+ <copy failonerror="false" file="src/main/resources/jetty-sslengine.xml" todir="../../etc" />
+ </tasks>
+ </configuration>
+ </execution>
+ <execution>
+ <id>clean</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <delete failonerror="false" file="../../lib/ext/${project.artifactId}-${project.version}.${project.packaging}"/>
+ <delete failonerror="false" file="../../etc/jetty-sslengine.xml"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>${maven-bundle-plugin-version}</version>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.mortbay.jetty.security</Bundle-SymbolicName>
+ <Bundle-RequiredExcutionEnvironment>J2SE-1.4</Bundle-RequiredExcutionEnvironment>
+ <Import-Package>*</Import-Package>
+ <Export-Package>org.mortbay.jetty.security;version=${project.version}</Export-Package>
+ <Bundle-DocURL>http://jetty.mortbay.org</Bundle-DocURL>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>${maven-jar-plugin-version}</version>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Copied: servicemix/m2-repo/org/mortbay/jetty/jetty-util/6.1.12rc1-smx/jetty-util-6.1.12rc1-smx.pom (from r694144, servicemix/m2-repo/org/mortbay/jetty/jetty-util/6.1.12-rc1/jetty-util-6.1.12-rc1.pom)
URL: http://svn.apache.org/viewvc/servicemix/m2-repo/org/mortbay/jetty/jetty-util/6.1.12rc1-smx/jetty-util-6.1.12rc1-smx.pom?p2=servicemix/m2-repo/org/mortbay/jetty/jetty-util/6.1.12rc1-smx/jetty-util-6.1.12rc1-smx.pom&p1=servicemix/m2-repo/org/mortbay/jetty/jetty-util/6.1.12-rc1/jetty-util-6.1.12-rc1.pom&r1=694144&r2=694271&rev=694271&view=diff
==============================================================================
--- servicemix/m2-repo/org/mortbay/jetty/jetty-util/6.1.12-rc1/jetty-util-6.1.12-rc1.pom (original)
+++ servicemix/m2-repo/org/mortbay/jetty/jetty-util/6.1.12rc1-smx/jetty-util-6.1.12rc1-smx.pom Thu Sep 11 07:23:22 2008
@@ -8,7 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>6.1.12-rc1</version>
+ <version>6.1.12rc1-smx</version>
<name>Jetty Utilities</name>
<url>http://jetty.mortbay.org</url>
<description>Utility classes for Jetty</description>
Added: servicemix/m2-repo/org/mortbay/jetty/jetty/6.1.12rc1-smx/jetty-6.1.12rc1-smx.jar
URL: http://svn.apache.org/viewvc/servicemix/m2-repo/org/mortbay/jetty/jetty/6.1.12rc1-smx/jetty-6.1.12rc1-smx.jar?rev=694271&view=auto
==============================================================================
Binary file - no diff available.
Propchange: servicemix/m2-repo/org/mortbay/jetty/jetty/6.1.12rc1-smx/jetty-6.1.12rc1-smx.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: servicemix/m2-repo/org/mortbay/jetty/jetty/6.1.12rc1-smx/jetty-6.1.12rc1-smx.pom
URL: http://svn.apache.org/viewvc/servicemix/m2-repo/org/mortbay/jetty/jetty/6.1.12rc1-smx/jetty-6.1.12rc1-smx.pom?rev=694271&view=auto
==============================================================================
--- servicemix/m2-repo/org/mortbay/jetty/jetty/6.1.12rc1-smx/jetty-6.1.12rc1-smx.pom (added)
+++ servicemix/m2-repo/org/mortbay/jetty/jetty/6.1.12rc1-smx/jetty-6.1.12rc1-smx.pom Thu Sep 11 07:23:22 2008
@@ -0,0 +1,112 @@
+<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">
+ <parent>
+ <artifactId>project</artifactId>
+ <groupId>org.mortbay.jetty</groupId>
+ <version>6.1.12rc1</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.12rc1-smx</version>
+ <name>Jetty Server</name>
+ <url>http://jetty.mortbay.org</url>
+ <description>Jetty server core</description>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>clean</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <delete includeemptydirs="true">
+ <fileset dir="../../lib/" includes="${project.artifactId}-${project.version}.${project.packaging}" />
+ <fileset dir="../../lib/" includes="servlet-api-2.5.jar" />
+ <fileset dir="../../etc/" includes="webdefault.xml" />
+ </delete>
+ </tasks>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copyjar</id>
+ <phase>install</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <copy failonerror="false" file="target/${project.artifactId}-${project.version}.${project.packaging}" tofile="../../lib/${project.artifactId}-${project.version}.${project.packaging}" />
+ <copy failonerror="false" file="src/main/resources/org/mortbay/jetty/webapp/webdefault.xml" tofile="../../etc/webdefault.xml" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>${maven-bundle-plugin-version}</version>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.mortbay.jetty.server</Bundle-SymbolicName>
+ <Bundle-RequiredExcutionEnvironment>J2SE-1.4</Bundle-RequiredExcutionEnvironment>
+ <Bundle-DocURL>http://jetty.mortbay.org</Bundle-DocURL>
+ <Import-Package>!org.mortbay.jetty.*,!org.mortbay.xml.*,!org.mortbay.resource.*,!org.mortbay.io.*,!org.mortbay.servlet.jetty.*,javax.servlet.resources;resolution:=optional,javax.servlet.jsp;resolution:=optional,org.apache.jasper.servlet;resolution:=optional,org.mortbay.jetty.handler.management;resolution:=optional,*</Import-Package>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>${maven-jar-plugin-version}</version>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api-2.5</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+</project>