You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2011/01/25 02:02:54 UTC
svn commit: r1063085 - in /geronimo/sandbox/djencks/txmanager:
geronimo-txmanager-server/pom.xml org.apache.geronimo.transaction.kar/pom.xml
org.apache.geronimo.transaction/pom.xml pom.xml
Author: djencks
Date: Tue Jan 25 01:02:53 2011
New Revision: 1063085
URL: http://svn.apache.org/viewvc?rev=1063085&view=rev
Log:
update use of karaf plugins to build a useable server (although legal files are missing
Modified:
geronimo/sandbox/djencks/txmanager/geronimo-txmanager-server/pom.xml
geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction.kar/pom.xml
geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction/pom.xml
geronimo/sandbox/djencks/txmanager/pom.xml
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=1063085&r1=1063084&r2=1063085&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-txmanager-server/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-txmanager-server/pom.xml Tue Jan 25 01:02:53 2011
@@ -25,80 +25,42 @@
<version>3.1.1-SNAPSHOT</version>
</parent>
<artifactId>geronimo-txmanager-server</artifactId>
- <packaging>server-assembly</packaging>
+ <packaging>karaf-assembly</packaging>
<properties>
- <geronimoVersion>3.0-SNAPSHOT</geronimoVersion>
+ <karafVersion>2.1.99-SNAPSHOT</karafVersion>
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.framework.plugingroups</groupId>
- <artifactId>framework</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
+ <groupId>org.apache.karaf.features.assembly</groupId>
+ <artifactId>karaf-framework</artifactId>
+ <version>${karafVersion}</version>
+ <type>kar</type>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr</artifactId>
- <version>1.6.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-transaction</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-connector</artifactId>
+ <groupId>org.apache.geronimo.features</groupId>
+ <artifactId>org.apache.geronimo.transaction.kar</artifactId>
+ <version>${project.version}</version>
+ <type>kar</type>
</dependency>
</dependencies>
<build>
<pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <version>${geronimoVersion}</version>
- <extensions>true</extensions>
- </plugin>
- </plugins>
+ <!--<plugins>-->
+ <!--<plugin>-->
+ <!--<groupId>org.apache.geronimo.buildsupport</groupId>-->
+ <!--<artifactId>car-maven-plugin</artifactId>-->
+ <!--<version>${geronimoVersion}</version>-->
+ <!--<extensions>true</extensions>-->
+ <!--</plugin>-->
+ <!--</plugins>-->
</pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <configuration>
- <servers>
- <serverInstance>
- <name>default</name>
- <configFile>var/config/config.xml</configFile>
- <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
- <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
- <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
- </serverInstance>
- <serverInstance>
- <name>client</name>
- <attributeManagerFrom>default</attributeManagerFrom>
- <artifactAliasesFile>var/config/client_artifact_aliases.properties</artifactAliasesFile>
- </serverInstance>
- <serverInstance>
- <name>offline</name>
- <configFile>var/config/offline-deployer-config.xml</configFile>
- <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
- <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
- <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
- </serverInstance>
- <serverInstance>
- <name>jsr88</name>
- <configFile>var/config/jsr88-configurer-config.xml</configFile>
- <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
- <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
- <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
- </serverInstance>
- </servers>
- </configuration>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>features-maven-plugin</artifactId>
+ <version>${karafVersion}</version>
</plugin>
</plugins>
</build>
Modified: geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction.kar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction.kar/pom.xml?rev=1063085&r1=1063084&r2=1063085&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction.kar/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction.kar/pom.xml Tue Jan 25 01:02:53 2011
@@ -59,32 +59,12 @@
</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>-->
+ <!--<resolver>OBR</resolver>-->
<!--</configuration>-->
</plugin>
</plugins>
Modified: 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=1063085&r1=1063084&r2=1063085&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction/pom.xml Tue Jan 25 01:02:53 2011
@@ -59,33 +59,10 @@
</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>
Modified: geronimo/sandbox/djencks/txmanager/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/pom.xml?rev=1063085&r1=1063084&r2=1063085&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/pom.xml Tue Jan 25 01:02:53 2011
@@ -14,7 +14,8 @@
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">
+--><!-- $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>
@@ -151,6 +152,12 @@
<specVersion>1.1</specVersion>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>features-maven-plugin</artifactId>
+ <version>2.1.99-SNAPSHOT</version>
+ <extensions>true</extensions>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -158,9 +165,9 @@
<modules>
<module>geronimo-transaction</module>
<module>geronimo-connector</module>
- <!--<module>geronimo-txmanager-server</module>-->
- <module>org.apache.geronimo.transaction</module>
- <module>org.apache.geronimo.transaction.kar</module>
- </modules>
+ <module>geronimo-txmanager-server</module>
+ <module>org.apache.geronimo.transaction</module>
+ <module>org.apache.geronimo.transaction.kar</module>
+ </modules>
</project>
\ No newline at end of file