[jboss-cvs] JBossAS SVN: r91062 - in projects/jboss-osgi/projects/runtime: equinox/trunk/src/main and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jul 10 06:25:49 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-07-10 06:25:48 -0400 (Fri, 10 Jul 2009)
New Revision: 91062
Removed:
projects/jboss-osgi/projects/runtime/equinox/trunk/scripts/
projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/resources/
projects/jboss-osgi/projects/runtime/felix/trunk/scripts/assembly-config.xml
projects/jboss-osgi/projects/runtime/felix/trunk/src/main/resources/
projects/jboss-osgi/projects/runtime/knopflerfish/trunk/scripts/
projects/jboss-osgi/projects/runtime/knopflerfish/trunk/src/main/resources/
Modified:
projects/jboss-osgi/projects/runtime/equinox/trunk/.classpath
projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml
projects/jboss-osgi/projects/runtime/felix/trunk/.classpath
projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml
projects/jboss-osgi/projects/runtime/knopflerfish/trunk/.classpath
projects/jboss-osgi/projects/runtime/knopflerfish/trunk/pom.xml
Log:
Move beans config to AS integration
Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/.classpath
===================================================================
--- projects/jboss-osgi/projects/runtime/equinox/trunk/.classpath 2009-07-10 10:24:31 UTC (rev 91061)
+++ projects/jboss-osgi/projects/runtime/equinox/trunk/.classpath 2009-07-10 10:25:48 UTC (rev 91062)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml 2009-07-10 10:24:31 UTC (rev 91061)
+++ projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml 2009-07-10 10:25:48 UTC (rev 91062)
@@ -49,32 +49,6 @@
</testResource>
</testResources>
<plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <finalName>${project.build.finalName}</finalName>
- <appendAssemblyId>true</appendAssemblyId>
- <descriptors>
- <descriptor>scripts/assembly-config.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>*beans.xml</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: projects/jboss-osgi/projects/runtime/felix/trunk/.classpath
===================================================================
--- projects/jboss-osgi/projects/runtime/felix/trunk/.classpath 2009-07-10 10:24:31 UTC (rev 91061)
+++ projects/jboss-osgi/projects/runtime/felix/trunk/.classpath 2009-07-10 10:25:48 UTC (rev 91062)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
Modified: projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml 2009-07-10 10:24:31 UTC (rev 91061)
+++ projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml 2009-07-10 10:25:48 UTC (rev 91062)
@@ -76,29 +76,8 @@
</descriptors>
</configuration>
</execution>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <finalName>${project.build.finalName}</finalName>
- <appendAssemblyId>true</appendAssemblyId>
- <descriptors>
- <descriptor>scripts/assembly-config.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>*beans.xml</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
Deleted: projects/jboss-osgi/projects/runtime/felix/trunk/scripts/assembly-config.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/felix/trunk/scripts/assembly-config.xml 2009-07-10 10:24:31 UTC (rev 91061)
+++ projects/jboss-osgi/projects/runtime/felix/trunk/scripts/assembly-config.xml 2009-07-10 10:25:48 UTC (rev 91062)
@@ -1,18 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-
- <id>config</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${project.build.outputDirectory}</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>*beans.xml</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
Modified: projects/jboss-osgi/projects/runtime/knopflerfish/trunk/.classpath
===================================================================
--- projects/jboss-osgi/projects/runtime/knopflerfish/trunk/.classpath 2009-07-10 10:24:31 UTC (rev 91061)
+++ projects/jboss-osgi/projects/runtime/knopflerfish/trunk/.classpath 2009-07-10 10:25:48 UTC (rev 91062)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
Modified: projects/jboss-osgi/projects/runtime/knopflerfish/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/knopflerfish/trunk/pom.xml 2009-07-10 10:24:31 UTC (rev 91061)
+++ projects/jboss-osgi/projects/runtime/knopflerfish/trunk/pom.xml 2009-07-10 10:25:48 UTC (rev 91062)
@@ -50,32 +50,6 @@
</testResource>
</testResources>
<plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <finalName>${project.build.finalName}</finalName>
- <appendAssemblyId>true</appendAssemblyId>
- <descriptors>
- <descriptor>scripts/assembly-config.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>*beans.xml</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
More information about the jboss-cvs-commits
mailing list