Author: cmoulliard Date: Mon Jan 24 14:59:06 2011 New Revision: 1062816 URL: http://svn.apache.org/viewvc?rev=1062816&view=rev Log: KARAF-414: Missing dependencies with Aries proxy/util
Added: karaf/trunk/diagnostic/core/org.apache.karaf.diagnostic.core.iml Modified: karaf/trunk/assembly/src/main/descriptors/unix-minimal-bin.xml karaf/trunk/assembly/src/main/descriptors/windows-minimal-bin.xml karaf/trunk/assembly/src/main/filtered-resources/minimal/startup.properties Modified: karaf/trunk/assembly/src/main/descriptors/unix-minimal-bin.xml URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/descriptors/unix-minimal-bin.xml?rev=1062816&r1=1062815&r2=1062816&view=diff ============================================================================== --- karaf/trunk/assembly/src/main/descriptors/unix-minimal-bin.xml (original) +++ karaf/trunk/assembly/src/main/descriptors/unix-minimal-bin.xml Mon Jan 24 14:59:06 2011 @@ -264,6 +264,39 @@ <unpack>false</unpack> <useProjectArtifact>false</useProjectArtifact> <outputFileNameMapping> + org/apache/aries/proxy/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} + </outputFileNameMapping> + <includes> + <include>org.apache.aries.proxy:org.apache.aries.proxy</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>/system</outputDirectory> + <unpack>false</unpack> + <useProjectArtifact>false</useProjectArtifact> + <outputFileNameMapping> + org/apache/aries/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} + </outputFileNameMapping> + <includes> + <include>org.apache.aries:org.apache.aries.util</include> + </includes> + </dependencySet> + <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.asm</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>/system</outputDirectory> + <unpack>false</unpack> + <useProjectArtifact>false</useProjectArtifact> + <outputFileNameMapping> org/apache/aries/jmx/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} </outputFileNameMapping> <includes> Modified: karaf/trunk/assembly/src/main/descriptors/windows-minimal-bin.xml URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/descriptors/windows-minimal-bin.xml?rev=1062816&r1=1062815&r2=1062816&view=diff ============================================================================== --- karaf/trunk/assembly/src/main/descriptors/windows-minimal-bin.xml (original) +++ karaf/trunk/assembly/src/main/descriptors/windows-minimal-bin.xml Mon Jan 24 14:59:06 2011 @@ -253,6 +253,39 @@ <unpack>false</unpack> <useProjectArtifact>false</useProjectArtifact> <outputFileNameMapping> + org/apache/aries/proxy/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} + </outputFileNameMapping> + <includes> + <include>org.apache.aries.proxy:org.apache.aries.proxy</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>/system</outputDirectory> + <unpack>false</unpack> + <useProjectArtifact>false</useProjectArtifact> + <outputFileNameMapping> + org/apache/aries/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} + </outputFileNameMapping> + <includes> + <include>org.apache.aries:org.apache.aries.util</include> + </includes> + </dependencySet> + <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.asm</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>/system</outputDirectory> + <unpack>false</unpack> + <useProjectArtifact>false</useProjectArtifact> + <outputFileNameMapping> org/apache/aries/jmx/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} </outputFileNameMapping> <includes> Modified: karaf/trunk/assembly/src/main/filtered-resources/minimal/startup.properties URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/minimal/startup.properties?rev=1062816&r1=1062815&r2=1062816&view=diff ============================================================================== --- karaf/trunk/assembly/src/main/filtered-resources/minimal/startup.properties (original) +++ karaf/trunk/assembly/src/main/filtered-resources/minimal/startup.properties Mon Jan 24 14:59:06 2011 @@ -33,6 +33,9 @@ org/apache/felix/org.apache.felix.filein # # The rest of the services.. # +org/apache/servicemix/bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}/org.apache.servicemix.bundles.asm-${asm.bundle.version}.jar=20 +org/apache/aries/org.apache.aries.util/${aries.util.version}/org.apache.aries.util-${aries.util.version}.jar=20 +org/apache/aries/proxy/org.apache.aries.proxy/${aries.proxy.version}/org.apache.aries.proxy-${aries.proxy.version}.jar=20 org/apache/aries/blueprint/org.apache.aries.blueprint/${aries.blueprint.version}/org.apache.aries.blueprint-${aries.blueprint.version}.jar=20 org/apache/karaf/shell/org.apache.karaf.shell.console/${project.version}/org.apache.karaf.shell.console-${project.version}.jar=30 Added: karaf/trunk/diagnostic/core/org.apache.karaf.diagnostic.core.iml URL: http://svn.apache.org/viewvc/karaf/trunk/diagnostic/core/org.apache.karaf.diagnostic.core.iml?rev=1062816&view=auto ============================================================================== --- karaf/trunk/diagnostic/core/org.apache.karaf.diagnostic.core.iml (added) +++ karaf/trunk/diagnostic/core/org.apache.karaf.diagnostic.core.iml Mon Jan 24 14:59:06 2011 @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/target/classes" /> + <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <excludeFolder url="file://$MODULE_DIR$/target" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.7" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:2.4" level="project" /> + </component> +</module> +