Author: thomas.diesler(a)jboss.com Date: 2009-07-10 07:02:27 -0400 (Fri, 10 Jul 2009) New Revision: 91067 Modified: projects/jboss-osgi/trunk/distribution/pom.xml projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/hudson/ant.properties.example Log: Fix AS integration after config move Modified: projects/jboss-osgi/trunk/distribution/pom.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/pom.xml 2009-07-10 10:46:36 UTC (rev 91066) +++ projects/jboss-osgi/trunk/distribution/pom.xml 2009-07-10 11:02:27 UTC (rev 91067) @@ -66,6 +66,12 @@ <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-integration-jbossas</artifactId> <version>${version.jboss.osgi.integration.jbossas}</version> + <classifier>config</classifier> + </dependency> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-integration-jbossas</artifactId> + <version>${version.jboss.osgi.integration.jbossas}</version> <classifier>sources</classifier> </dependency> <dependency> @@ -149,12 +155,6 @@ <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime-equinox</artifactId> <version>${version.jboss.osgi.runtime.equinox}</version> - <classifier>config</classifier> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-equinox</artifactId> - <version>${version.jboss.osgi.runtime.equinox}</version> <classifier>sources</classifier> </dependency> @@ -167,12 +167,6 @@ <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime-felix</artifactId> <version>${version.jboss.osgi.runtime.felix}</version> - <classifier>config</classifier> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version.jboss.osgi.runtime.felix}</version> <classifier>sources</classifier> </dependency> <dependency> @@ -205,12 +199,6 @@ <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime-knopflerfish</artifactId> <version>${version.jboss.osgi.runtime.knopflerfish}</version> - <classifier>config</classifier> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-knopflerfish</artifactId> - <version>${version.jboss.osgi.runtime.knopflerfish}</version> <classifier>sources</classifier> </dependency> Modified: projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml 2009-07-10 10:46:36 UTC (rev 91066) +++ projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml 2009-07-10 11:02:27 UTC (rev 91067) @@ -304,8 +304,8 @@ <include name="jboss-osgi-runtime-felix.jar" /> <include name="org.apache.felix.framework.jar" /> </fileset> - <singefile condition="isFelix" src=&quot;(a){deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-felix.xml&quot; - target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/osgi-jboss-beans.xml" override="true"/> + <singlefile condition="isFelix" src=&quot;(a){deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-felix.xml&quot; + target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" override="true"/> <fileset condition="isFelix" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> <include name="org.osgi.compendium.jar" /> </fileset> @@ -317,8 +317,8 @@ <include name="org.apache.equinox.framework.jar" /> <include name="org.eclipse.osgi.jar"/> </fileset> - <singefile condition="isEquinox" src=&quot;(a){deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-equinox.xml&quot; - target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/osgi-jboss-beans.xml" override="true"/> + <singlefile condition="isEquinox" src=&quot;(a){deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-equinox.xml&quot; + target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" override="true"/> <fileset condition="isEquinox" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> <include name="org.eclipse.osgi.services.jar" /> </fileset> @@ -329,8 +329,8 @@ <include name="jboss-osgi-runtime-knopflerfish.jar" /> <include name="org.knopflerfish.framework.jar" /> </fileset> - <singefile condition="isKnopflerfish" src=&quot;(a){deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-knopflerfish.xml&quot; - target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/osgi-jboss-beans.xml" override="true"/> + <singlefile condition="isKnopflerfish" src=&quot;(a){deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-knopflerfish.xml&quot; + target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" override="true"/> <fileset condition="isKnopflerfish" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> <include name="org.osgi.compendium.jar" /> </fileset> Modified: projects/jboss-osgi/trunk/hudson/ant.properties.example =================================================================== --- projects/jboss-osgi/trunk/hudson/ant.properties.example 2009-07-10 10:46:36 UTC (rev 91066) +++ projects/jboss-osgi/trunk/hudson/ant.properties.example 2009-07-10 11:02:27 UTC (rev 91067) @@ -33,4 +33,8 @@ # Hudson (1.290) apache-tomcat=5.5.27 -sun-hudson=2402/128862 \ No newline at end of file +sun-hudson=2402/128862 + +# authentication cancelled error +# https://hudson.dev.java.net/issues/show_bug.cgi?id=3936 +