deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From johndam...@apache.org
Subject [3/3] git commit: DELTASPIKE-467 Added module.xml files and updated assembly to reflect this.
Date Sat, 14 Dec 2013 23:15:30 GMT
DELTASPIKE-467 Added module.xml files and updated assembly to reflect this.


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/7f14a66a
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/7f14a66a
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/7f14a66a

Branch: refs/heads/master
Commit: 7f14a66a313bec0b46d5f38c560f2493815e9f9e
Parents: 45d84dc
Author: John D. Ament <john.d.ament@gmail.com>
Authored: Sat Dec 14 18:07:54 2013 -0500
Committer: John D. Ament <john.d.ament@gmail.com>
Committed: Sat Dec 14 18:07:54 2013 -0500

----------------------------------------------------------------------
 deltaspike/dist/full/assembly.xml               | 63 ---------------
 deltaspike/dist/full/pom.xml                    |  2 +-
 .../full/src/main/distribution/assembly.xml     | 83 ++++++++++++++++++++
 .../src/main/distribution/cdictrl-module.xml    | 33 ++++++++
 .../full/src/main/distribution/core-module.xml  | 32 ++++++++
 .../src/main/distribution/modules-module.xml    | 45 +++++++++++
 6 files changed, 194 insertions(+), 64 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7f14a66a/deltaspike/dist/full/assembly.xml
----------------------------------------------------------------------
diff --git a/deltaspike/dist/full/assembly.xml b/deltaspike/dist/full/assembly.xml
deleted file mode 100644
index 30a2865..0000000
--- a/deltaspike/dist/full/assembly.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-  <id>distribution</id>
-  <formats>
-    <format>zip</format>
-    <format>tar.gz</format>
-  </formats>
-  <fileSets>
-    <fileSet>
-      <directory>${project.basedir}/../..</directory>
-      <includes>
-        <include>README*</include>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
-      </includes>
-      <outputDirectory>.</outputDirectory>
-      <useDefaultExcludes>true</useDefaultExcludes>
-    </fileSet>
-  </fileSets>
-    <dependencySets>
-        <dependencySet>
-            <includes>
-                <include>org.apache.deltaspike.modules:*</include>
-            </includes>
-            <excludes>
-                <exclude>org.apache.deltaspike.modules:deltaspike-test-control-module-api</exclude>
-                <exclude>org.apache.deltaspike.modules:deltaspike-test-control-module-impl</exclude>
-            </excludes>
-            <outputDirectory>modules</outputDirectory>
-        </dependencySet>
-        <dependencySet>
-            <includes>
-                <include>org.apache.deltaspike.core:*</include>
-            </includes>
-            <outputDirectory>core</outputDirectory>
-        </dependencySet>
-        <dependencySet>
-            <includes>
-                <include>org.apache.deltaspike.cdictrl:*</include>
-            </includes>
-            <outputDirectory>cdictrl</outputDirectory>
-        </dependencySet>
-    </dependencySets>
-</assembly>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7f14a66a/deltaspike/dist/full/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/dist/full/pom.xml b/deltaspike/dist/full/pom.xml
index f733dce..1b5af93 100644
--- a/deltaspike/dist/full/pom.xml
+++ b/deltaspike/dist/full/pom.xml
@@ -52,7 +52,7 @@
             </goals>
         <configuration>
           <descriptors>
-            <descriptor>assembly.xml</descriptor>
+            <descriptor>src/main/distribution/assembly.xml</descriptor>
           </descriptors>
           <appendAssemblyId>false</appendAssemblyId>
           <finalName>deltaspike-full-${project.version}</finalName>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7f14a66a/deltaspike/dist/full/src/main/distribution/assembly.xml
----------------------------------------------------------------------
diff --git a/deltaspike/dist/full/src/main/distribution/assembly.xml b/deltaspike/dist/full/src/main/distribution/assembly.xml
new file mode 100644
index 0000000..6639baf
--- /dev/null
+++ b/deltaspike/dist/full/src/main/distribution/assembly.xml
@@ -0,0 +1,83 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+  <id>distribution</id>
+  <formats>
+    <format>zip</format>
+    <format>tar.gz</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>${project.basedir}/../..</directory>
+      <includes>
+        <include>README*</include>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
+      </includes>
+      <outputDirectory>.</outputDirectory>
+      <useDefaultExcludes>true</useDefaultExcludes>
+    </fileSet>
+  </fileSets>
+    <dependencySets>
+        <dependencySet>
+            <includes>
+                <include>org.apache.deltaspike.modules:*</include>
+            </includes>
+            <excludes>
+                <exclude>org.apache.deltaspike.modules:deltaspike-test-control-module-api</exclude>
+                <exclude>org.apache.deltaspike.modules:deltaspike-test-control-module-impl</exclude>
+            </excludes>
+            <outputDirectory>modules</outputDirectory>
+        </dependencySet>
+        <dependencySet>
+            <includes>
+                <include>org.apache.deltaspike.core:*</include>
+            </includes>
+            <outputDirectory>core</outputDirectory>
+        </dependencySet>
+        <dependencySet>
+            <includes>
+                <include>org.apache.deltaspike.cdictrl:*</include>
+            </includes>
+            <outputDirectory>cdictrl</outputDirectory>
+        </dependencySet>
+    </dependencySets>
+    <files>
+        <file>
+            <source>src/main/distribution/core-module.xml</source>
+            <outputDirectory>core</outputDirectory>
+            <destName>module.xml</destName>
+            <filtered>true</filtered>
+        </file>
+        <file>
+            <source>src/main/distribution/cdictrl-module.xml</source>
+            <outputDirectory>cdictrl</outputDirectory>
+            <destName>module.xml</destName>
+            <filtered>true</filtered>
+        </file>
+        <file>
+            <source>src/main/distribution/modules-module.xml</source>
+            <outputDirectory>modules</outputDirectory>
+            <destName>module.xml</destName>
+            <filtered>true</filtered>
+        </file>
+    </files>
+</assembly>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7f14a66a/deltaspike/dist/full/src/main/distribution/cdictrl-module.xml
----------------------------------------------------------------------
diff --git a/deltaspike/dist/full/src/main/distribution/cdictrl-module.xml b/deltaspike/dist/full/src/main/distribution/cdictrl-module.xml
new file mode 100644
index 0000000..6b269c2
--- /dev/null
+++ b/deltaspike/dist/full/src/main/distribution/cdictrl-module.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<module xmlns="urn:jboss:module:1.1" name="org.apache.deltaspike.cdictrl">
+    <resources>
+        <resource-root path="deltaspike-cdictrl-api-${project.version}.jar"/>
+        <resource-root path="deltaspike-cdictrl-weld-${project.version}.jar"/>
+    </resources>
+
+    <dependencies>
+        <module name="org.apache.deltaspike.core"/>
+        <module name="javaee.api"/>
+        <module name="javax.api"/>
+    </dependencies>
+</module>
+

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7f14a66a/deltaspike/dist/full/src/main/distribution/core-module.xml
----------------------------------------------------------------------
diff --git a/deltaspike/dist/full/src/main/distribution/core-module.xml b/deltaspike/dist/full/src/main/distribution/core-module.xml
new file mode 100644
index 0000000..b4eabc1
--- /dev/null
+++ b/deltaspike/dist/full/src/main/distribution/core-module.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<module xmlns="urn:jboss:module:1.1" name="org.apache.deltaspike.core">
+    <resources>
+        <resource-root path="deltaspike-core-api-${project.version}.jar"/>
+        <resource-root path="deltaspike-core-impl-${project.version}.jar"/>
+    </resources>
+
+    <dependencies>
+        <module name="javaee.api"/>
+        <module name="javax.api"/>
+    </dependencies>
+</module>
+

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7f14a66a/deltaspike/dist/full/src/main/distribution/modules-module.xml
----------------------------------------------------------------------
diff --git a/deltaspike/dist/full/src/main/distribution/modules-module.xml b/deltaspike/dist/full/src/main/distribution/modules-module.xml
new file mode 100644
index 0000000..6c23daf
--- /dev/null
+++ b/deltaspike/dist/full/src/main/distribution/modules-module.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<module xmlns="urn:jboss:module:1.1" name="org.apache.deltaspike.modules">
+    <resources>
+        <resource-root path="deltaspike-bean-validation-module-api-${project.version}.jar"/>
+        <resource-root path="deltaspike-bean-validation-module-impl-${project.version}.jar"/>
+        <resource-root path="deltaspike-data-module-api-${project.version}.jar"/>
+        <resource-root path="deltaspike-data-module-impl-${project.version}.jar"/>
+        <resource-root path="deltaspike-jpa-module-api-${project.version}.jar"/>
+        <resource-root path="deltaspike-jpa-module-impl-${project.version}.jar"/>
+        <resource-root path="deltaspike-jsf-module-api-${project.version}.jar"/>
+        <resource-root path="deltaspike-jsf-module-impl-${project.version}.jar"/>
+        <resource-root path="deltaspike-partial-bean-module-api-${project.version}.jar"/>
+        <resource-root path="deltaspike-partial-bean-module-impl-${project.version}.jar"/>
+        <resource-root path="deltaspike-security-module-api-${project.version}.jar"/>
+        <resource-root path="deltaspike-security-module-impl-${project.version}.jar"/>
+        <resource-root path="deltaspike-servlet-module-api-${project.version}.jar"/>
+        <resource-root path="deltaspike-servlet-module-impl-${project.version}.jar"/>
+    </resources>
+
+    <dependencies>
+        <module name="org.apache.deltaspike.core"/>
+        <module name="javaee.api"/>
+        <module name="javax.api"/>
+    </dependencies>
+</module>
+


Mime
View raw message