Author: gnodet
Date: Fri Feb 6 13:36:49 2009
New Revision: 741564
URL: http://svn.apache.org/viewvc?rev=741564&view=rev
Log:
Remove all warnings from the build and make it work offline
Removed:
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/test/resources/org/apache/servicemix/kernel/gshell/features/repo2.xml
Modified:
servicemix/smx4/kernel/trunk/assembly/pom.xml
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/FeaturesServiceTest.java
servicemix/smx4/kernel/trunk/main/pom.xml
servicemix/smx4/kernel/trunk/pom.xml
Modified: servicemix/smx4/kernel/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/pom.xml?rev=741564&r1=741563&r2=741564&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/pom.xml Fri Feb 6 13:36:49 2009
@@ -314,7 +314,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
+ <version>2.2-beta-3</version>
<executions>
<execution>
<id>unix-bin</id>
Modified:
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=741564&r1=741563&r2=741564&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
(original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml Fri
Feb 6 13:36:49 2009
@@ -125,6 +125,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.felix:org.osgi.compendium</include>
@@ -135,6 +136,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/ops4j/pax/logging/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.ops4j.pax.logging:pax-logging-api</include>
@@ -144,6 +146,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.ops4j.pax.url:pax-url-mvn</include>
@@ -153,6 +156,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/springframework/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.springframework:spring-aop</include>
@@ -164,6 +168,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/springframework/osgi/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.springframework.osgi:spring-osgi-core</include>
@@ -174,6 +179,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/apache/geronimo/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
@@ -183,6 +189,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/apache/servicemix/bundles/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance</include>
@@ -200,6 +207,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/apache/servicemix/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</include>
@@ -208,6 +216,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/apache/servicemix/kernel/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.filemonitor</include>
@@ -218,6 +227,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/apache/servicemix/kernel/gshell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.core</include>
@@ -232,6 +242,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/apache/servicemix/kernel/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.config</include>
@@ -241,6 +252,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>com/google/code/sshd/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>com.google.code.sshd:sshd</include>
@@ -249,6 +261,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/osgi/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.osgi:jmx</include>
@@ -257,6 +270,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>com/oracle/osgi/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>com.oracle.osgi:jmx-impl</include>
Modified:
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=741564&r1=741563&r2=741564&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
(original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
Fri Feb 6 13:36:49 2009
@@ -117,6 +117,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.felix:org.osgi.compendium</include>
@@ -127,6 +128,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/ops4j/pax/logging/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.ops4j.pax.logging:pax-logging-api</include>
@@ -136,6 +138,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.ops4j.pax.url:pax-url-mvn</include>
@@ -145,6 +148,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/springframework/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.springframework:spring-aop</include>
@@ -156,6 +160,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/springframework/osgi/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.springframework.osgi:spring-osgi-core</include>
@@ -166,6 +171,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/apache/geronimo/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
@@ -175,6 +181,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/apache/servicemix/bundles/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance</include>
@@ -192,6 +199,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/apache/servicemix/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</include>
@@ -200,6 +208,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/apache/servicemix/kernel/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.filemonitor</include>
@@ -210,6 +219,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/apache/servicemix/kernel/gshell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.core</include>
@@ -224,6 +234,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/apache/servicemix/kernel/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.config</include>
@@ -233,6 +244,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>com/google/code/sshd/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>com.google.code.sshd:sshd</include>
@@ -241,6 +253,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/osgi/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.osgi:jmx</include>
@@ -249,6 +262,7 @@
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>com/oracle/osgi/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>com.oracle.osgi:jmx-impl</include>
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml?rev=741564&r1=741563&r2=741564&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml Fri Feb 6 13:36:49
2009
@@ -48,19 +48,10 @@
org.apache.commons.vfs.provider.temp,
org.apache.commons.vfs.provider.ram,
jline*,
- org.apache.ivy*;resolution:=optional,
org.apache.servicemix.kernel.jaas.config;resolution:=optional,
org.apache.servicemix.kernel.version;resolution:=optional,
org.apache.servicemix.kernel.main.spi;resolution:=optional;version="1.0.0",
- com.thoughtworks.xstream*;resolution:=optional,
- junit.framework*;resolution:=optional,
org.codehaus.plexus*;resolution:=optional,
- org.apache.maven*;resolution:=optional,
- org.apache.mina*;resolution:=optional,
- net.sf.jpam*;resolution:=optional,
- com.jcraft*;resolution:=optional,
- org.bouncycastle*;resolution:=optional,
- com.sun*;resolution:=optional,
com.google.code.sshd.server.keyprovider,
com.google.code.sshd.server.jaas,
org.jsecurity*;resolution:=optional,
@@ -70,8 +61,8 @@
<gshell.osgi.export>
org.apache.geronimo.gshell*;version="1.0.0.alpha-2-SNAPSHOT";-split-package:=merge-first,
org.apache.servicemix.kernel.gshell.core*,
- org.codehaus.plexus.interpolation*,
- org.codehaus.plexus.util
+ org.codehaus.plexus.interpolation*;-split-package:=merge-first,
+ org.codehaus.plexus.util;-split-package:=merge-first
</gshell.osgi.export>
</properties>
Modified:
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/FeaturesServiceTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/FeaturesServiceTest.java?rev=741564&r1=741563&r2=741564&view=diff
==============================================================================
---
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/FeaturesServiceTest.java
(original)
+++
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/FeaturesServiceTest.java
Fri Feb 6 13:36:49 2009
@@ -17,7 +17,12 @@
package org.apache.servicemix.kernel.gshell.features;
import java.net.URI;
+import java.net.URL;
import java.io.InputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.PrintWriter;
import static org.easymock.EasyMock.*;
@@ -28,12 +33,28 @@
import org.osgi.service.prefs.Preferences;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Bundle;
+import org.springframework.context.ApplicationContext;
import junit.framework.TestCase;
public class FeaturesServiceTest extends TestCase {
public void testInstallFeature() throws Exception {
- URI uri = getClass().getResource("repo2.xml").toURI();
+
+ String name = ApplicationContext.class.getName();
+ name = name.replace(".", "/") + ".class";
+ name = getClass().getClassLoader().getResource(name).toString();
+ name = name.substring("jar:".length(), name.indexOf('!'));
+
+ File tmp = File.createTempFile("smx", ".feature");
+ PrintWriter pw = new PrintWriter(new FileWriter(tmp));
+ pw.println("<features>");
+ pw.println(" <feature name=\"f1\">");
+ pw.println(" <bundle>" + name + "</bundle>");
+ pw.println(" </feature>");
+ pw.println("</features>");
+ pw.close();
+
+ URI uri = tmp.toURI();
Preferences prefs = EasyMock.createMock(Preferences.class);
PreferencesService preferencesService =
EasyMock.createMock(PreferencesService.class);
@@ -72,7 +93,7 @@
assertEquals(0, features[0].getDependencies().size());
assertNotNull(features[0].getBundles());
assertEquals(1, features[0].getBundles().size());
-
assertEquals("http://repo1.maven.org/maven2/org/apache/geronimo/specs/geronimo-stax-api_1.0_spec/1.0.1/geronimo-stax-api_1.0_spec-1.0.1.jar";,
features[0].getBundles().get(0));
+ assertEquals(name, features[0].getBundles().get(0));
verify(preferencesService, prefs, repositoriesNode, featuresNode,
bundleContext, installedBundle);
Modified: servicemix/smx4/kernel/trunk/main/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/main/pom.xml?rev=741564&r1=741563&r2=741564&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/main/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/main/pom.xml Fri Feb 6 13:36:49 2009
@@ -63,7 +63,7 @@
<Export-Package>org.apache.servicemix.kernel.main.spi.*;version=${pom.version}</Export-Package>
<Private-Package>
org.apache.servicemix.kernel.main;-split-package:=merge-first,
- org.apache.felix.moduleloader.*,
+
org.apache.felix.moduleloader.*;-split-package:=merge-first,
org.apache.felix.framework.*;-split-package:=merge-first,
org.osgi.framework;-split-package:=merge-first,
org.osgi.service.packageadmin;-split-package:=merge-first,
Modified: servicemix/smx4/kernel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/pom.xml?rev=741564&r1=741563&r2=741564&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/pom.xml Fri Feb 6 13:36:49 2009
@@ -104,6 +104,8 @@
<sshd.version>0.1</sshd.version>
<woodstox.version>3.2.7_1</woodstox.version>
<osgi.jmx.version>1.0-r6125-patched</osgi.jmx.version>
+
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<repositories>
