Author: antelder
Date: Tue Feb 17 17:07:16 2009
New Revision: 745154
URL: http://svn.apache.org/viewvc?rev=745154&view=rev
Log:
Start bringing up the osgi junit plugin as a standalone project
Added:
tuscany/maven-plugins/trunk/maven-osgi-junit/ (props changed)
- copied from r745143, tuscany/java/sca/tools/maven/maven-osgi-junit/
tuscany/maven-plugins/trunk/maven-osgi-junit/README
tuscany/maven-plugins/trunk/maven-osgi-junit/src/main/java/org/apache/tuscany/maven/
tuscany/maven-plugins/trunk/maven-osgi-junit/src/main/java/org/apache/tuscany/maven/plugin/
tuscany/maven-plugins/trunk/maven-osgi-junit/src/main/java/org/apache/tuscany/maven/plugin/surefire/
(props changed)
- copied from r745143,
tuscany/java/sca/tools/maven/maven-osgi-junit/src/main/java/org/apache/tuscany/sca/maven/plugin/surefire/
Removed:
tuscany/maven-plugins/trunk/maven-osgi-junit/src/main/java/org/apache/tuscany/sca/maven/plugin/surefire/
Modified:
tuscany/maven-plugins/trunk/maven-osgi-junit/NOTICE
tuscany/maven-plugins/trunk/maven-osgi-junit/pom.xml
tuscany/maven-plugins/trunk/maven-osgi-junit/src/main/java/org/apache/tuscany/maven/plugin/surefire/ForkConfiguration.java
tuscany/maven-plugins/trunk/maven-osgi-junit/src/main/java/org/apache/tuscany/maven/plugin/surefire/OSGiSurefireBooter.java
tuscany/maven-plugins/trunk/maven-osgi-junit/src/main/java/org/apache/tuscany/maven/plugin/surefire/OSGiSurefirePlugin.java
Propchange: tuscany/maven-plugins/trunk/maven-osgi-junit/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Feb 17 17:07:16 2009
@@ -0,0 +1,14 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml
Propchange: tuscany/maven-plugins/trunk/maven-osgi-junit/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Feb 17 17:07:16 2009
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/tools/maven/maven-osgi-junit:671193
Modified: tuscany/maven-plugins/trunk/maven-osgi-junit/NOTICE
URL:
http://svn.apache.org/viewvc/tuscany/maven-plugins/trunk/maven-osgi-junit/NOTICE?rev=745154&r1=745143&r2=745154&view=diff
==============================================================================
--- tuscany/maven-plugins/trunk/maven-osgi-junit/NOTICE (original)
+++ tuscany/maven-plugins/trunk/maven-osgi-junit/NOTICE Tue Feb 17 17:07:16 2009
@@ -1,4 +1,4 @@
-${pom.name}
+Apache Tuscany Maven OSGi JUnit Plugin
Copyright (c) 2005 - 2009 The Apache Software Foundation
This product includes software developed by
Added: tuscany/maven-plugins/trunk/maven-osgi-junit/README
URL:
http://svn.apache.org/viewvc/tuscany/maven-plugins/trunk/maven-osgi-junit/README?rev=745154&view=auto
==============================================================================
--- tuscany/maven-plugins/trunk/maven-osgi-junit/README (added)
+++ tuscany/maven-plugins/trunk/maven-osgi-junit/README Tue Feb 17 17:07:16 2009
@@ -0,0 +1,67 @@
+A Maven plugin used by the Tuscany SCA project for OSGi JUnit testing.
+Not exactly clear what its does, there's some discusssion about it at:
+http://apache.markmail.org/message/uxt7afrquwc75qxj
+
+To build, from the top maven-bundle-plugin run maven:
+
+mvn
+
+or once all the dependencies have been downloaded and a succesful build run
use:
+
+mvn clean install -o
+
+So as to avoid the Tuscany SCA project using SNAPSHOT dependencies any changes
+to this module should be released and the Tuscany SCA project updated to use
+the newly released version.
+
+To release this module:
+
+mvn release:prepare
+
+followed by:
+
+mvn release:perform
+
+That will automatically create an SVN tag from the release, update the version
+numbers in the pom.xml files in the trunk and tag, and deploy the artifacts to
the
+staging repository defined by the <deploy.altRepository> in your Maven
settings.xml.
+While running it will prompt you for the names for the tag, release version
etc.
+
+In your maven settings.xml file you must have a server defined named
"apache.releases",
+and a profile named "release". For example:
+
+ <servers>
+ ...
+ <server>
+ <id>apache.releases</id>
+ <username>antelder</username>
+ <privateKey>\ant\id_dsa</privateKey>
+ <passphrase>xxx</passphrase>
+ <directoryPermissions>775</directoryPermissions>
+ <filePermissions>664</filePermissions>
+ </server>
+ </servers>
+
+ <profiles>
+ ...
+ <profile>
+ <id>release</id>
+ <properties>
+ <gpg.passphrase>...</gpg.passphrase>
+
<deploy.altRepository>apache.releases::default::scp://people.apache.org/home/antelder/public_html/tuscany/maven-osgi-junit-plugin-1.0</deploy.altRepository>
+ </properties>
+ </profile>
+ </profiles>
+
+Call a vote to release the module, eg:
http://apache.markmail.org/message/6jnlfxbx7uklt5nv
+
+After a successful vote copy the staging artifacts to the live repository, eg:
+
+cp -p -v -R maven-bundle-plugin-1.0/org/apache/tuscany/maven/plugins/
/x1/www/people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/tuscany/maven/plugins
+
+
+
+
+
+
+
Modified: tuscany/maven-plugins/trunk/maven-osgi-junit/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/maven-plugins/trunk/maven-osgi-junit/pom.xml?rev=745154&r1=745143&r2=745154&view=diff
==============================================================================
--- tuscany/maven-plugins/trunk/maven-osgi-junit/pom.xml (original)
+++ tuscany/maven-plugins/trunk/maven-osgi-junit/pom.xml Tue Feb 17 17:07:16
2009
@@ -1,33 +1,154 @@
<?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.
+ * 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>
+<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>
<parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-maven-tools</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>4</version>
</parent>
- <artifactId>tuscany-maven-osgi-junit</artifactId>
+
+ <groupId>org.apache.tuscany.maven.plugins</groupId>
+ <artifactId>maven-osgi-junit-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <name>Apache Tuscany SCA OSGi JUnit Maven Plugin</name>
+ <name>Apache Tuscany OSGi JUnit Maven Plugin</name>
+ <version>1.0-SNAPSHOT</version>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/tuscany/maven-plugins/trunk/maven-bundle-plugin</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/tuscany/maven-plugins/trunk/maven-bundle-plugin</developerConnection>
+ <url>http://svn.apache.org/repos/asf/tuscany/</url>
+ </scm>
+
+ <distributionManagement>
+ <repository>
+ <id>apache.releases</id>
+ <name>Apache Release Distribution Repository</name>
+
<url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
+ </repository>
+ <snapshotRepository>
+ <id>apache.snapshots</id>
+ <name>Apache Development Snapshot Repository</name>
+
<url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
+ <uniqueVersion>false</uniqueVersion>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <repositories>
+ <!-- Apache SNAPSHOT repository for unreleased artifacts -->
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache SNAPSHOT Repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <!-- Apache repository for artifacts released by Apache TLP projects
-->
+ <pluginRepository>
+ <id>apache</id>
+ <name>Apache Repository</name>
+
<url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+
+ <!-- Apache SNAPSHOT repository for unreleased artifacts -->
+ <pluginRepository>
+ <id>apache.snapshots</id>
+ <name>Apache SNAPSHOT Repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+
+ </pluginRepositories>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+
+ <plugin>
+ <inherited>true</inherited>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+
<altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
+ <updateReleaseInfo>true</updateReleaseInfo>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.0-alpha-4</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>deploy</id>
+ <build>
+ <defaultGoal>deploy</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.0.4</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
<dependencies>
@@ -67,4 +188,93 @@
</dependency>
</dependencies>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>.</directory>
+ <targetPath>META-INF</targetPath>
+ <filtering>true</filtering>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <pluginManagement>
+
+ <plugins>
+ <!-- compiler plugin configuration -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ <!-- jar plugin configuration -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <archive>
+ <manifestEntries>
+
<Extension-Name>${project.artifactId}</Extension-Name>
+
<Specification-Title>${name}</Specification-Title>
+ <Specification-Vendor>The Apache Software
Foundation</Specification-Vendor>
+
<Specification-Version>${version}</Specification-Version>
+
<Implementation-Title>${name}</Implementation-Title>
+
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+ <Implementation-Vendor>The Apache Software
Foundation</Implementation-Vendor>
+
<Implementation-Version>${version}</Implementation-Version>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+
+ <!-- surefire plugin configuration -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <includes>
+ <include>**/*TestCase.java</include>
+ </includes>
+ <reportFormat>brief</reportFormat>
+ <useFile>false</useFile>
+ <forkMode>once</forkMode>
+ <argLine>-ea -Xmx256m</argLine>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+
<tagBase>https://svn.apache.org/repos/asf/tuscany/maven-plugins/tags</tagBase>
+ <useReleaseProfile>false</useReleaseProfile>
+ <preparationGoals>clean install</preparationGoals>
+ <goals>deploy</goals>
+ <arguments>-Prelease,deploy</arguments>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
+
+ </plugins>
+
+ </pluginManagement>
+
+ </build>
+
</project>
Propchange:
tuscany/maven-plugins/trunk/maven-osgi-junit/src/main/java/org/apache/tuscany/maven/plugin/surefire/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Feb 17 17:07:16 2009
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/tools/maven/maven-osgi-junit/src/main/java/org/apache/tuscany/sca/maven/plugin/surefire:671193
Modified:
tuscany/maven-plugins/trunk/maven-osgi-junit/src/main/java/org/apache/tuscany/maven/plugin/surefire/ForkConfiguration.java
URL:
http://svn.apache.org/viewvc/tuscany/maven-plugins/trunk/maven-osgi-junit/src/main/java/org/apache/tuscany/maven/plugin/surefire/ForkConfiguration.java?rev=745154&r1=745143&r2=745154&view=diff
==============================================================================
---
tuscany/maven-plugins/trunk/maven-osgi-junit/src/main/java/org/apache/tuscany/maven/plugin/surefire/ForkConfiguration.java
(original)
+++
tuscany/maven-plugins/trunk/maven-osgi-junit/src/main/java/org/apache/tuscany/maven/plugin/surefire/ForkConfiguration.java
Tue Feb 17 17:07:16 2009
@@ -1,4 +1,4 @@
-package org.apache.tuscany.sca.maven.plugin.surefire;
+package org.apache.tuscany.maven.plugin.surefire;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified:
tuscany/maven-plugins/trunk/maven-osgi-junit/src/main/java/org/apache/tuscany/maven/plugin/surefire/OSGiSurefireBooter.java
URL:
http://svn.apache.org/viewvc/tuscany/maven-plugins/trunk/maven-osgi-junit/src/main/java/org/apache/tuscany/maven/plugin/surefire/OSGiSurefireBooter.java?rev=745154&r1=745143&r2=745154&view=diff
==============================================================================
---
tuscany/maven-plugins/trunk/maven-osgi-junit/src/main/java/org/apache/tuscany/maven/plugin/surefire/OSGiSurefireBooter.java
(original)
+++
tuscany/maven-plugins/trunk/maven-osgi-junit/src/main/java/org/apache/tuscany/maven/plugin/surefire/OSGiSurefireBooter.java
Tue Feb 17 17:07:16 2009
@@ -1,4 +1,4 @@
-package org.apache.tuscany.sca.maven.plugin.surefire;
+package org.apache.tuscany.maven.plugin.surefire;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified:
tuscany/maven-plugins/trunk/maven-osgi-junit/src/main/java/org/apache/tuscany/maven/plugin/surefire/OSGiSurefirePlugin.java
URL:
http://svn.apache.org/viewvc/tuscany/maven-plugins/trunk/maven-osgi-junit/src/main/java/org/apache/tuscany/maven/plugin/surefire/OSGiSurefirePlugin.java?rev=745154&r1=745143&r2=745154&view=diff
==============================================================================
---
tuscany/maven-plugins/trunk/maven-osgi-junit/src/main/java/org/apache/tuscany/maven/plugin/surefire/OSGiSurefirePlugin.java
(original)
+++
tuscany/maven-plugins/trunk/maven-osgi-junit/src/main/java/org/apache/tuscany/maven/plugin/surefire/OSGiSurefirePlugin.java
Tue Feb 17 17:07:16 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.maven.plugin.surefire;
+package org.apache.tuscany.maven.plugin.surefire;
import static org.osgi.framework.Constants.BUNDLE_MANIFESTVERSION;
import static org.osgi.framework.Constants.BUNDLE_NAME;
