You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by jc...@apache.org on 2006/11/18 17:51:35 UTC
svn commit: r476564 - in /directory/sandbox/jconlon/osgi-mina: ./
integration-osgi/ mina-osgi-example-integration-test/
mina-osgi-example-integration-test/src/test/java/org/apache/mina/osgi/example/chat/test/
mina-osgi-example/
Author: jconlon
Date: Sat Nov 18 08:51:34 2006
New Revision: 476564
URL: http://svn.apache.org/viewvc?view=rev&rev=476564
Log:
flatened groupID heirarchy and removed parent pom because of maven bug http://jira.codehaus.org/browse/MNG-1682
Removed:
directory/sandbox/jconlon/osgi-mina/pom.xml
Modified:
directory/sandbox/jconlon/osgi-mina/README
directory/sandbox/jconlon/osgi-mina/integration-osgi/pom.xml
directory/sandbox/jconlon/osgi-mina/mina-osgi-example-integration-test/pom.xml
directory/sandbox/jconlon/osgi-mina/mina-osgi-example-integration-test/src/test/java/org/apache/mina/osgi/example/chat/test/MinaOSGIExampleChatBundleTest.java
directory/sandbox/jconlon/osgi-mina/mina-osgi-example/pom.xml
Modified: directory/sandbox/jconlon/osgi-mina/README
URL: http://svn.apache.org/viewvc/directory/sandbox/jconlon/osgi-mina/README?view=diff&rev=476564&r1=476563&r2=476564
==============================================================================
--- directory/sandbox/jconlon/osgi-mina/README (original)
+++ directory/sandbox/jconlon/osgi-mina/README Sat Nov 18 08:51:34 2006
@@ -1,7 +1,6 @@
-Due to a bug* in maven the pom.xml in this directory fails to properly install
+Due to a bug* in maven using a pom.xml in this directory fails to properly install
the correct artifacts in the m2 repository. To build and install the subprojects
-please execute a mvn clean from this directory and build each subproject manually
-by changing directories to each of the subdirectories and executing a mvn install.
+please build each subproject manually.
The subprojects must be built in the following order:
integration-osgi
@@ -9,8 +8,8 @@
mina-osgi-example-integration-test.
-* This is truly a major bug with maven. Here it is folks
+* This is truly a major bug with maven.
http://jira.codehaus.org/browse/MNG-1682
-will everyone please go to the above Jira and
+Please go to the above Jira and
vote to impeach this bug..
Modified: directory/sandbox/jconlon/osgi-mina/integration-osgi/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/jconlon/osgi-mina/integration-osgi/pom.xml?view=diff&rev=476564&r1=476563&r2=476564
==============================================================================
--- directory/sandbox/jconlon/osgi-mina/integration-osgi/pom.xml (original)
+++ directory/sandbox/jconlon/osgi-mina/integration-osgi/pom.xml Sat Nov 18 08:51:34 2006
@@ -1,16 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<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.mina.osgi</groupId>
<artifactId>build</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
-
+ -->
<description>
This bundle simply wraps mina ${pom.version} jars.
</description>
<artifactId>mina-integration-osgi</artifactId>
+ <groupId>org.apache.mina</groupId>
+ <version>1.1.0-SNAPSHOT</version>
<name>${pom.artifactId} bundle</name>
<packaging>bundle</packaging>
Modified: directory/sandbox/jconlon/osgi-mina/mina-osgi-example-integration-test/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/jconlon/osgi-mina/mina-osgi-example-integration-test/pom.xml?view=diff&rev=476564&r1=476563&r2=476564
==============================================================================
--- directory/sandbox/jconlon/osgi-mina/mina-osgi-example-integration-test/pom.xml (original)
+++ directory/sandbox/jconlon/osgi-mina/mina-osgi-example-integration-test/pom.xml Sat Nov 18 08:51:34 2006
@@ -1,16 +1,18 @@
<?xml version="1.0"?>
<project>
<modelVersion>4.0.0</modelVersion>
- <parent>
+ <!--<parent>
<groupId>org.apache.mina.osgi</groupId>
<artifactId>build</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
-
+-->
<description>
OSGi integration tests for the mina-osgi-example chat service and client.
</description>
+ <groupId>org.apache.mina</groupId>
<artifactId>mina-osgi-example-integration-test</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
<name>${pom.artifactId} suite</name>
<dependencies>
@@ -35,7 +37,7 @@
</dependency>
<dependency>
- <groupId>org.apache.mina.osgi</groupId>
+ <groupId>org.apache.mina</groupId>
<artifactId>mina-osgi-example</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>
@@ -63,7 +65,7 @@
</dependency>
<dependency>
- <groupId>org.apache.mina.osgi</groupId>
+ <groupId>org.apache.mina</groupId>
<artifactId>mina-integration-osgi</artifactId>
<version>1.1.0-SNAPSHOT</version>
Modified: directory/sandbox/jconlon/osgi-mina/mina-osgi-example-integration-test/src/test/java/org/apache/mina/osgi/example/chat/test/MinaOSGIExampleChatBundleTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/jconlon/osgi-mina/mina-osgi-example-integration-test/src/test/java/org/apache/mina/osgi/example/chat/test/MinaOSGIExampleChatBundleTest.java?view=diff&rev=476564&r1=476563&r2=476564
==============================================================================
--- directory/sandbox/jconlon/osgi-mina/mina-osgi-example-integration-test/src/test/java/org/apache/mina/osgi/example/chat/test/MinaOSGIExampleChatBundleTest.java (original)
+++ directory/sandbox/jconlon/osgi-mina/mina-osgi-example-integration-test/src/test/java/org/apache/mina/osgi/example/chat/test/MinaOSGIExampleChatBundleTest.java Sat Nov 18 08:51:34 2006
@@ -49,7 +49,7 @@
* The tests have access to a BundleContext, which we use to test that the
* simpleService bean was indeed published as an OSGi service.
*
- * @author Adrian Colyer
+ *
*/
public class MinaOSGIExampleChatBundleTest extends
ConfigurableBundleCreatorTests {
@@ -59,7 +59,7 @@
private static final int port = 1234;
LogService logService;
static {
- System.setProperty("log4j.configuration","file:src/test/resources/log4j.properties");
+// System.setProperty("log4j.configuration","file:src/test/resources/log4j.properties");
}
Modified: directory/sandbox/jconlon/osgi-mina/mina-osgi-example/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/jconlon/osgi-mina/mina-osgi-example/pom.xml?view=diff&rev=476564&r1=476563&r2=476564
==============================================================================
--- directory/sandbox/jconlon/osgi-mina/mina-osgi-example/pom.xml (original)
+++ directory/sandbox/jconlon/osgi-mina/mina-osgi-example/pom.xml Sat Nov 18 08:51:34 2006
@@ -1,22 +1,26 @@
<?xml version="1.0"?>
<project>
<modelVersion>4.0.0</modelVersion>
+ <!--
<parent>
<groupId>org.apache.mina.osgi</groupId>
<artifactId>build</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
+ -->
<description>
Bundles an example mina chat service by exposing its spring configuration for Spring-osgi to dynamically discover it at runtime. Spring-osgi will then register it as an OSGi service. Bundle also exports the chat client packages.
</description>
<artifactId>mina-osgi-example</artifactId>
+ <groupId>org.apache.mina</groupId>
+ <version>1.1.0-SNAPSHOT</version>
<name>${pom.artifactId} bundle</name>
<packaging>osgi-bundle</packaging>
<dependencies>
<dependency>
- <groupId>org.apache.mina.osgi</groupId>
+ <groupId>org.apache.mina</groupId>
<artifactId>mina-integration-osgi</artifactId>
<version>1.1.0-SNAPSHOT</version>
<scope>provided</scope>