You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by jo...@apache.org on 2013/12/15 00:15:28 UTC

[1/3] git commit: DELTASPIKE-263 Added a full distribution of DeltaSpike binaries in zip and tar.gz formats.

Updated Branches:
  refs/heads/master fc25a1722 -> 7f14a66a3


DELTASPIKE-263 Added a full distribution of DeltaSpike binaries in zip and tar.gz formats.


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

Branch: refs/heads/master
Commit: ff18da53d0fc7b11ddc200cf2144ff3641195910
Parents: fc25a17
Author: John D. Ament <jo...@gmail.com>
Authored: Sun Dec 8 16:48:29 2013 -0500
Committer: John D. Ament <jo...@gmail.com>
Committed: Sat Dec 14 15:11:10 2013 -0500

----------------------------------------------------------------------
 deltaspike/dist/bom/pom.xml       | 164 ++++++++++++++++++++++++++++
 deltaspike/dist/full/assembly.xml |  63 +++++++++++
 deltaspike/dist/full/pom.xml      |  66 +++++++++++
 deltaspike/dist/pom.xml           | 193 +++++++++++++++++++++++++++++++++
 deltaspike/parent/pom.xml         |  14 +++
 5 files changed, 500 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/ff18da53/deltaspike/dist/bom/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/dist/bom/pom.xml b/deltaspike/dist/bom/pom.xml
new file mode 100644
index 0000000..f0cc501
--- /dev/null
+++ b/deltaspike/dist/bom/pom.xml
@@ -0,0 +1,164 @@
+<?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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.deltaspike.distribution</groupId>
+        <artifactId>distributions-project</artifactId>
+        <version>0.6-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>distributions-bom</artifactId>
+    <version>0.6-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>Apache DeltaSpike Distribution Bill of Materials</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.deltaspike.core</groupId>
+            <artifactId>deltaspike-core-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.deltaspike.core</groupId>
+            <artifactId>deltaspike-core-impl</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-security-module-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-security-module-impl</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-jpa-module-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-jpa-module-impl</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-servlet-module-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-servlet-module-impl</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-jsf-module-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-jsf-module-impl</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-data-module-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-data-module-impl</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <!-- Dependencies for Java-SE -->
+        <dependency>
+            <groupId>org.apache.deltaspike.cdictrl</groupId>
+            <artifactId>deltaspike-cdictrl-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.deltaspike.cdictrl</groupId>
+            <artifactId>deltaspike-cdictrl-owb</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.deltaspike.cdictrl</groupId>
+            <artifactId>deltaspike-cdictrl-weld</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-partial-bean-module-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-partial-bean-module-impl</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-test-control-module-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-test-control-module-impl</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-bean-validation-module-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-bean-validation-module-impl</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+
+</project>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/ff18da53/deltaspike/dist/full/assembly.xml
----------------------------------------------------------------------
diff --git a/deltaspike/dist/full/assembly.xml b/deltaspike/dist/full/assembly.xml
new file mode 100644
index 0000000..30a2865
--- /dev/null
+++ b/deltaspike/dist/full/assembly.xml
@@ -0,0 +1,63 @@
+<!--
+ 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/ff18da53/deltaspike/dist/full/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/dist/full/pom.xml b/deltaspike/dist/full/pom.xml
new file mode 100644
index 0000000..f733dce
--- /dev/null
+++ b/deltaspike/dist/full/pom.xml
@@ -0,0 +1,66 @@
+<?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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+    <groupId>org.apache.deltaspike.distribution</groupId>
+    <artifactId>distributions-project</artifactId>
+        <version>0.6-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>distribution-full</artifactId>
+    <packaging>pom</packaging>
+
+    <name>Apache DeltaSpike Full Distribution</name>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.deltaspike.distribution</groupId>
+            <artifactId>distributions-bom</artifactId>
+            <version>${project.version}</version>
+            <scope>import</scope>
+            <type>pom</type>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+        <execution>
+            <id>assemble</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+        <configuration>
+          <descriptors>
+            <descriptor>assembly.xml</descriptor>
+          </descriptors>
+          <appendAssemblyId>false</appendAssemblyId>
+          <finalName>deltaspike-full-${project.version}</finalName>
+        </configuration>
+        </execution>
+        </executions>
+      </plugin>
+        </plugins>
+    </build>
+
+</project>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/ff18da53/deltaspike/dist/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/dist/pom.xml b/deltaspike/dist/pom.xml
new file mode 100644
index 0000000..7aa4ace
--- /dev/null
+++ b/deltaspike/dist/pom.xml
@@ -0,0 +1,193 @@
+<?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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.deltaspike</groupId>
+        <artifactId>parent-code</artifactId>
+        <version>0.6-SNAPSHOT</version>
+        <relativePath>../parent/code/pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.deltaspike.distribution</groupId>
+    <artifactId>distributions-project</artifactId>
+    <version>0.6-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>Apache DeltaSpike Distribution</name>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.deltaspike.core</groupId>
+                <artifactId>deltaspike-core-api</artifactId>
+                <version>${project.version}</version>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.deltaspike.core</groupId>
+                <artifactId>deltaspike-core-impl</artifactId>
+                <version>${project.version}</version>
+                <scope>runtime</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.deltaspike.modules</groupId>
+                <artifactId>deltaspike-security-module-api</artifactId>
+                <version>${project.version}</version>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.deltaspike.modules</groupId>
+                <artifactId>deltaspike-security-module-impl</artifactId>
+                <version>${project.version}</version>
+                <scope>runtime</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.deltaspike.modules</groupId>
+                <artifactId>deltaspike-jpa-module-api</artifactId>
+                <version>${project.version}</version>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.deltaspike.modules</groupId>
+                <artifactId>deltaspike-jpa-module-impl</artifactId>
+                <version>${project.version}</version>
+                <scope>runtime</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.deltaspike.modules</groupId>
+                <artifactId>deltaspike-servlet-module-api</artifactId>
+                <version>${project.version}</version>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.deltaspike.modules</groupId>
+                <artifactId>deltaspike-servlet-module-impl</artifactId>
+                <version>${project.version}</version>
+                <scope>runtime</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.deltaspike.modules</groupId>
+                <artifactId>deltaspike-jsf-module-api</artifactId>
+                <version>${project.version}</version>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.deltaspike.modules</groupId>
+                <artifactId>deltaspike-jsf-module-impl</artifactId>
+                <version>${project.version}</version>
+                <scope>runtime</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.deltaspike.modules</groupId>
+                <artifactId>deltaspike-data-module-api</artifactId>
+                <version>${project.version}</version>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.deltaspike.modules</groupId>
+                <artifactId>deltaspike-data-module-impl</artifactId>
+                <version>${project.version}</version>
+                <scope>runtime</scope>
+            </dependency>
+
+            <!-- Dependencies for Java-SE -->
+            <dependency>
+                <groupId>org.apache.deltaspike.cdictrl</groupId>
+                <artifactId>deltaspike-cdictrl-api</artifactId>
+                <version>${project.version}</version>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.deltaspike.cdictrl</groupId>
+                <artifactId>deltaspike-cdictrl-owb</artifactId>
+                <version>${project.version}</version>
+                <scope>runtime</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.deltaspike.cdictrl</groupId>
+                <artifactId>deltaspike-cdictrl-weld</artifactId>
+                <version>${project.version}</version>
+                <scope>runtime</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.deltaspike.modules</groupId>
+                <artifactId>deltaspike-partial-bean-module-api</artifactId>
+                <version>${project.version}</version>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.deltaspike.modules</groupId>
+                <artifactId>deltaspike-partial-bean-module-impl</artifactId>
+                <version>${project.version}</version>
+                <scope>runtime</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.deltaspike.modules</groupId>
+                <artifactId>deltaspike-test-control-module-api</artifactId>
+                <version>${project.version}</version>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.deltaspike.modules</groupId>
+                <artifactId>deltaspike-test-control-module-impl</artifactId>
+                <version>${project.version}</version>
+                <scope>runtime</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.deltaspike.modules</groupId>
+                <artifactId>deltaspike-bean-validation-module-api</artifactId>
+                <version>${project.version}</version>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.deltaspike.modules</groupId>
+                <artifactId>deltaspike-bean-validation-module-impl</artifactId>
+                <version>${project.version}</version>
+                <scope>runtime</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <modules>
+        <module>bom</module>
+        <module>full</module>
+    </modules>
+</project>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/ff18da53/deltaspike/parent/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index e05c130..d91db0c 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -562,6 +562,20 @@
             </dependency>
 
             <dependency>
+                <groupId>org.apache.deltaspike.modules</groupId>
+                <artifactId>deltaspike-bean-validation-module-api</artifactId>
+                <version>${project.version}</version>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.deltaspike.modules</groupId>
+                <artifactId>deltaspike-bean-validation-module-impl</artifactId>
+                <version>${project.version}</version>
+                <scope>runtime</scope>
+            </dependency>
+
+            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-servlet_2.5_spec</artifactId>
                 <version>${geronimo-servlet-2.5-spec.version}</version>


[2/3] git commit: DELTASPIKE-263 Added a distribution profile.

Posted by jo...@apache.org.
DELTASPIKE-263 Added a distribution profile.


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

Branch: refs/heads/master
Commit: 45d84dc4dea019824e0fa98225db36568ab0bd86
Parents: ff18da5
Author: John D. Ament <jo...@gmail.com>
Authored: Sat Dec 14 15:15:20 2013 -0500
Committer: John D. Ament <jo...@gmail.com>
Committed: Sat Dec 14 15:15:20 2013 -0500

----------------------------------------------------------------------
 deltaspike/pom.xml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/45d84dc4/deltaspike/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/pom.xml b/deltaspike/pom.xml
index 7fbb522..e069099 100644
--- a/deltaspike/pom.xml
+++ b/deltaspike/pom.xml
@@ -132,6 +132,18 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>distribution</id>
+            <modules>
+                <module>checkstyle-rules</module>
+                <module>parent</module>
+                <module>test-utils</module>
+                <module>core</module>
+                <module>cdictrl</module>
+                <module>modules</module>
+                <module>examples</module>
+                <module>dist</module>
+            </modules>
+        </profile>
     </profiles>
-
 </project>


[3/3] git commit: DELTASPIKE-467 Added module.xml files and updated assembly to reflect this.

Posted by jo...@apache.org.
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 <jo...@gmail.com>
Authored: Sat Dec 14 18:07:54 2013 -0500
Committer: John D. Ament <jo...@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>
+