geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1060722 - in /geronimo/sandbox/djencks/txmanager: geronimo-connector/pom.xml geronimo-transaction/pom.xml geronimo-txmanager-server/pom.xml org.apache.geronimo.transaction/ org.apache.geronimo.transaction/pom.xml pom.xml
Date Wed, 19 Jan 2011 09:12:00 GMT
Author: djencks
Date: Wed Jan 19 09:11:59 2011
New Revision: 1060722

URL: http://svn.apache.org/viewvc?rev=1060722&view=rev
Log:
add a project to generate a karaf feature using experimental feature plugin at github

Added:
    geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction/
    geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction/pom.xml   (with props)
Modified:
    geronimo/sandbox/djencks/txmanager/geronimo-connector/pom.xml
    geronimo/sandbox/djencks/txmanager/geronimo-transaction/pom.xml
    geronimo/sandbox/djencks/txmanager/geronimo-txmanager-server/pom.xml
    geronimo/sandbox/djencks/txmanager/pom.xml

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector/pom.xml?rev=1060722&r1=1060721&r2=1060722&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector/pom.xml Wed Jan 19 09:11:59 2011
@@ -67,6 +67,17 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr.annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>

Modified: geronimo/sandbox/djencks/txmanager/geronimo-transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-transaction/pom.xml?rev=1060722&r1=1060721&r2=1060722&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-transaction/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-transaction/pom.xml Wed Jan 19 09:11:59 2011
@@ -69,10 +69,12 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

Modified: geronimo/sandbox/djencks/txmanager/geronimo-txmanager-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-txmanager-server/pom.xml?rev=1060722&r1=1060721&r2=1060722&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-txmanager-server/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-txmanager-server/pom.xml Wed Jan 19 09:11:59
2011
@@ -1,4 +1,21 @@
 <?xml version="1.0"?>
+<!--
+    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.
+-->
+
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>

Added: geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction/pom.xml?rev=1060722&view=auto
==============================================================================
--- geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction/pom.xml (added)
+++ geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction/pom.xml Wed Jan 19
09:11:59 2011
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<!--
+    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.
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>geronimo-txmanager-parent</artifactId>
+        <groupId>org.apache.geronimo.components</groupId>
+        <version>3.1.1-SNAPSHOT</version>
+    </parent>
+    <groupId>org.apache.geronimo.features</groupId>
+    <artifactId>org.apache.geronimo.transaction</artifactId>
+    <packaging>feature</packaging>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.components</groupId>
+            <artifactId>geronimo-connector</artifactId>
+        </dependency>
+
+        <!-- we also need to install scr to get this stuff to work. Should be a separate
feature -->
+
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr</artifactId>
+            <version>1.6.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.shell</artifactId>
+            <version>1.5.0-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.osgi</groupId>
+                    <artifactId>org.osgi.core</artifactId>
+                 </exclusion>
+                <exclusion>
+                    <groupId>org.osgi</groupId>
+                    <artifactId>org.osgi.compendium</artifactId>
+                 </exclusion>
+            </exclusions>
+        </dependency>
+        
+        
+    </dependencies>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.karaf.tooling</groupId>
+                    <artifactId>features-maven-plugin</artifactId>
+                    <version>2.1.99-SNAPSHOT</version>
+                    <extensions>true</extensions>
+                    <!--<configuration>-->
+                    <!--<category>MyCategory</category>-->
+                    <!--</configuration>-->
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.karaf.tooling</groupId>
+                <artifactId>features-maven-plugin</artifactId>
+                <!--<configuration>-->
+                <!--<deploymentConfigs></deploymentConfigs>-->
+                <!--<useMavenDependencies>-->
+                <!--<value>true</value>-->
+                <!--<includeVersion>true</includeVersion>-->
+                <!--</useMavenDependencies>-->
+                <!--<instance>-->
+                <!--<plugin-artifact></plugin-artifact>-->
+                <!--</instance>-->
+                <!--</configuration>-->
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/sandbox/djencks/txmanager/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/pom.xml?rev=1060722&r1=1060721&r2=1060722&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/pom.xml Wed Jan 19 09:11:59 2011
@@ -158,7 +158,8 @@
     <modules>
         <module>geronimo-transaction</module>
         <module>geronimo-connector</module>
-    <module>geronimo-txmanager-server</module>
+    <!--<module>geronimo-txmanager-server</module>-->
+    <module>org.apache.geronimo.transaction</module>
   </modules>
 
 </project>
\ No newline at end of file



Mime
View raw message