geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r887148 - in /geronimo/server/trunk/framework: bundles/karaf-client/ bundles/karaf-client/pom.xml bundles/pom.xml configs/karaf-framework/pom.xml configs/karaf-framework/src/main/history/dependencies.xml
Date Fri, 04 Dec 2009 10:17:09 GMT
Author: genspring
Date: Fri Dec  4 10:17:08 2009
New Revision: 887148

URL: http://svn.apache.org/viewvc?rev=887148&view=rev
Log:
GERONIMO-4973 Classpath entrys in karaf-client.jar is ../system/ instead of ../repository/,
 bundles might not be the best place to put karaf-client. But let's put it here for now.

Added:
    geronimo/server/trunk/framework/bundles/karaf-client/
    geronimo/server/trunk/framework/bundles/karaf-client/pom.xml   (with props)
Modified:
    geronimo/server/trunk/framework/bundles/pom.xml
    geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml

Added: geronimo/server/trunk/framework/bundles/karaf-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/karaf-client/pom.xml?rev=887148&view=auto
==============================================================================
--- geronimo/server/trunk/framework/bundles/karaf-client/pom.xml (added)
+++ geronimo/server/trunk/framework/bundles/karaf-client/pom.xml Fri Dec  4 10:17:08 2009
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<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">
+
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.geronimo.bundles</groupId>
+    <artifactId>karaf-client</artifactId>
+    <packaging>jar</packaging>
+    <version>1.1.0-SNAPSHOT</version>
+    <name>karaf-client</name>
+    <description>
+        This bundle simply replaces the leading path of classpath entrys from ../system to
../repository in MANIFEST.MF.
+    </description>
+    
+    <properties>
+        <pkgGroupId>org.apache.felix.karaf</pkgGroupId>
+        <pkgArtifactId>org.apache.felix.karaf.client</pkgArtifactId>
+        <pkgVersion>1.1.0-SNAPSHOT</pkgVersion>
+    </properties>
+    
+    <dependencies>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>jline</groupId>
+                        <artifactId>jline</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-simple</artifactId>
+                    </exclusion>
+                </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <unzip
+                                    src="${settings.localRepository}/org/apache/felix/karaf/${pkgArtifactId}/${pkgVersion}/${pkgArtifactId}-${pkgVersion}.jar"
+                                    dest="target/classes" overwrite="true" />
+                                <replace file="target/classes/META-INF/MANIFEST.MF"
+                                    token="../system/" value="../repository/" />
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <!--useDefaultManifestFile will use the replaced target/classes/META-INF/MANIFEST.MF
as the MANIFEST.MF in the jar.-->
+                    <useDefaultManifestFile>true</useDefaultManifestFile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
+
+

Propchange: geronimo/server/trunk/framework/bundles/karaf-client/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/framework/bundles/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/pom.xml?rev=887148&r1=887147&r2=887148&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/pom.xml Fri Dec  4 10:17:08 2009
@@ -48,6 +48,7 @@
         <module>woden-impl-dom</module>
         <module>backport-util-concurrent</module>        
         <module>httpcore</module>
+        <module>karaf-client</module>
         <!-- todo remove -->
         <module>log4j</module>
         <module>sxc-jaxb</module>

Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=887148&r1=887147&r2=887148&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Fri Dec  4 10:17:08 2009
@@ -102,8 +102,8 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.felix.karaf</groupId>
-                <artifactId>org.apache.felix.karaf.client</artifactId>
+                <groupId>org.apache.geronimo.bundles</groupId>
+                <artifactId>karaf-client</artifactId>
                 <version>${felix.karaf.version}</version>
                 <exclusions>
                     <exclusion>
@@ -242,8 +242,8 @@
             <artifactId>org.apache.felix.karaf.main</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix.karaf</groupId>
-            <artifactId>org.apache.felix.karaf.client</artifactId>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>karaf-client</artifactId>                           
      
         </dependency>
         <!--<dependency>-->
             <!--<groupId>org.apache.felix.karaf.deployer</groupId>-->
@@ -559,8 +559,8 @@
                                     <destFileName>karaf.jar</destFileName>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.apache.felix.karaf</groupId>
-                                    <artifactId>org.apache.felix.karaf.client</artifactId>
+                                    <groupId>org.apache.geronimo.bundles</groupId>
+                                    <artifactId>karaf-client</artifactId>
                                     <outputDirectory>target/dependencies</outputDirectory>
                                     <destFileName>karaf-client.jar</destFileName>
                                 </artifactItem>

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml?rev=887148&r1=887147&r2=887148&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
Fri Dec  4 10:17:08 2009
@@ -182,6 +182,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>karaf-client</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-cli</artifactId>
         <type>jar</type>



Mime
View raw message