Author: [email protected]
Date: Mon May 21 10:16:38 2012
New Revision: 2363
Log:
[AMDATUOPENSOCIAL-209] Separated assemblies
Added:
trunk/amdatu-release-demo/src/main/assembly/auth-components.xml
trunk/amdatu-release-demo/src/main/assembly/auth-dir.xml
trunk/amdatu-release-demo/src/main/assembly/auth-zip.xml
trunk/amdatu-release-demo/src/main/assembly/cassandra-components.xml
trunk/amdatu-release-demo/src/main/assembly/cassandra-dir.xml
trunk/amdatu-release-demo/src/main/assembly/cassandra-zip.xml
trunk/amdatu-release-demo/src/main/assembly/opensocia-component.xml
- copied, changed from r2359,
/trunk/amdatu-release-demo/src/main/assembly/bin-component.xml
trunk/amdatu-release-demo/src/main/assembly/opensocial-dir.xml
trunk/amdatu-release-demo/src/main/assembly/opensocial-zip.xml
Modified:
trunk/amdatu-release-demo/pom.xml
trunk/amdatu-release-demo/src/main/assembly/bin-component.xml
trunk/amdatu-release-demo/src/main/assembly/bin-release.xml
trunk/amdatu-release-demo/src/main/assembly/dev-server.xml
Modified: trunk/amdatu-release-demo/pom.xml
==============================================================================
--- trunk/amdatu-release-demo/pom.xml (original)
+++ trunk/amdatu-release-demo/pom.xml Mon May 21 10:16:38 2012
@@ -23,7 +23,8 @@
<version>6-RC2</version>
<relativePath>../amdatu-parent/pom.xml</relativePath>
</parent>
- <artifactId>org.amdatu.auth.release.demo</artifactId>
+ <artifactId>org.amdatu.release.demo</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Amdatu - Demo release</name>
@@ -634,10 +635,15 @@
<goal>single</goal>
</goals>
<configuration>
- <appendAssemblyId>false</appendAssemblyId>
+ <finalName>demo-${project.version}</finalName>
+ <appendAssemblyId>true</appendAssemblyId>
<descriptors>
- <descriptor>src/main/assembly/dev-server.xml</descriptor>
- <descriptor>src/main/assembly/bin-release.xml</descriptor>
+ <descriptor>src/main/assembly/auth-dir.xml</descriptor>
+ <descriptor>src/main/assembly/auth-bin.xml</descriptor>
+
<descriptor>src/main/assembly/opensocial-dir.xml</descriptor>
+
<descriptor>src/main/assembly/opensocial-bin.xml</descriptor>
+
<descriptor>src/main/assembly/cassandra-dir.xml</descriptor>
+
<descriptor>src/main/assembly/cassandra-bin.xml</descriptor>
</descriptors>
</configuration>
</execution>
Added: trunk/amdatu-release-demo/src/main/assembly/auth-components.xml
==============================================================================
--- (empty file)
+++ trunk/amdatu-release-demo/src/main/assembly/auth-components.xml Mon May
21 10:16:38 2012
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2
http://maven.apache.org/xsd/component-1.1.2.xsd";>
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>org.osgi:org.osgi.compendium</include>
+ <include>org.apache.felix:org.apache.felix.main</include>
+ <include>org.apache.felix:org.apache.felix.fileinstall</include>
+ </includes>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ </dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>multitenantweb</outputDirectory>
+ <includes>
+ <include>org.apache.felix:org.apache.felix.dependencymanager</include>
+
<include>org.apache.felix:org.apache.felix.dependencymanager.shell</include>
+ <include>org.apache.felix:org.apache.felix.metatype</include>
+ <include>org.apache.felix:org.apache.felix.log</include>
+ <include>org.apache.felix:org.apache.felix.shell</include>
+ <include>org.apache.felix:org.apache.felix.shell.tui</include>
+ <include>org.apache.ace:org.apache.ace.managementagent</include>
+ <include>org.amdatu.tenant:org.amdatu.tenant.api</include>
+ <include>org.amdatu.tenant:org.amdatu.tenant.adapter</include>
+ <include>org.amdatu.tenant:org.amdatu.tenant.conf.rp</include>
+ <include>org.amdatu.tenant:org.amdatu.tenant.factory</include>
+
<include>org.amdatu.fileinstall:org.amdatu.fileinstall.autoconf</include>
+
<include>org.amdatu.fileinstall:org.amdatu.fileinstall.tenantconf</include>
+ <include>org.amdatu.deployment:org.amdatu.deployment.autoconf</include>
+
<include>org.amdatu.configadmin:org.amdatu.multitenant.org.apache.felix.configadmin</include>
+
<include>org.amdatu.eventadmin:org.amdatu.multitenant.org.apache.felix.eventadmin</include>
+
<include>org.amdatu.preferences:org.amdatu.multitenant.org.apache.felix.prefs</include>
+
<include>org.amdatu.useradmin:org.amdatu.multitenant.org.ops4j.pax.useradmin.pax-useradmin-service</include>
+
<include>org.amdatu.useradmin:org.amdatu.multitenant.org.amdatu.useradmin.pax.fsstorage</include>
+ <include>org.amdatu.web:org.amdatu.web.dispatcher</include>
+ <include>org.amdatu.web:org.amdatu.web.httpcontext</include>
+
<include>org.amdatu.httpservice:org.amdatu.multitenant.org.apache.felix.http.jetty</include>
+ <include>org.amdatu.web:org.amdatu.web.jaxrs</include>
+
<include>org.amdatu.web:org.amdatu.web.tenantresolver.hostname</include>
+
<include>org.amdatu.web:org.amdatu.web.tenantresolver.parameter</include>
+ <include>org.amdatu.web:org.amdatu.web.wink</include>
+ <include>org.amdatu.web:org.amdatu.web.jsp</include>
+ <include>org.amdatu.web:org.amdatu.web.resource</include>
+ <include>org.amdatu.template:org.amdatu.template.processor</include>
+ </includes>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ </dependencySet>
+
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>deploy</outputDirectory>
+ <includes>
+ <include>org.amdatu.auth:*</include>
+ </includes>
+ <excludes>
+
<exclude>org.amdatu.auth:org.amdatu.auth.example.oauth.consumer</exclude>
+
<exclude>org.amdatu.auth:org.amdatu.auth.example.oauth.provider</exclude>
+ <exclude>org.amdatu.auth:org.amdatu.auth.config</exclude>
+ </excludes>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ </dependencySet>
+
+ <!--Unpack the the config files to deploy directory -->
+ <dependencySet>
+ <outputDirectory>deploy</outputDirectory>
+ <includes>
+ <include>org.amdatu.auth:org.amdatu.auth.config</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ <filtered>true</filtered>
+ </unpackOptions>
+ <outputFileNameMapping></outputFileNameMapping> <!-- MASSEMBLY-533 -->
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory></directory>
+ <outputDirectory></outputDirectory>
+ <filtered>false</filtered>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources/bin</directory>
+ <outputDirectory></outputDirectory>
+ <filtered>true</filtered>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources/conf</directory>
+ <outputDirectory>conf</outputDirectory>
+ <filtered>true</filtered>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources/shortcuts</directory>
+ <outputDirectory></outputDirectory>
+ <filtered>true</filtered>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources/config</directory>
+ <outputDirectory>multitenantweb</outputDirectory>
+ <filtered>true</filtered>
+ </fileSet>
+ </fileSets>
+</component>
\ No newline at end of file
Added: trunk/amdatu-release-demo/src/main/assembly/auth-dir.xml
==============================================================================
--- (empty file)
+++ trunk/amdatu-release-demo/src/main/assembly/auth-dir.xml Mon May 21
10:16:38 2012
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2010, 2011 The Amdatu Foundation
+
+ Licensed 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.verning 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>auth-dir</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <componentDescriptors>
+
<componentDescriptor>src/main/assembly/auth-components.xml</componentDescriptor>
+ </componentDescriptors>
+</assembly>
\ No newline at end of file
Added: trunk/amdatu-release-demo/src/main/assembly/auth-zip.xml
==============================================================================
--- (empty file)
+++ trunk/amdatu-release-demo/src/main/assembly/auth-zip.xml Mon May 21
10:16:38 2012
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2010, 2011 The Amdatu Foundation
+
+ Licensed 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.verning 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>auth-bin</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <componentDescriptors>
+
<componentDescriptor>src/main/assembly/auth-components.xml</componentDescriptor>
+ </componentDescriptors>
+</assembly>
\ No newline at end of file
Added: trunk/amdatu-release-demo/src/main/assembly/cassandra-components.xml
==============================================================================
--- (empty file)
+++ trunk/amdatu-release-demo/src/main/assembly/cassandra-components.xml
Mon May 21 10:16:38 2012
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2
http://maven.apache.org/xsd/component-1.1.2.xsd";>
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>org.osgi:org.osgi.compendium</include>
+ <include>org.apache.felix:org.apache.felix.main</include>
+ <include>org.apache.felix:org.apache.felix.fileinstall</include>
+ </includes>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ </dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>multitenantweb</outputDirectory>
+ <includes>
+ <include>org.apache.felix:org.apache.felix.dependencymanager</include>
+
<include>org.apache.felix:org.apache.felix.dependencymanager.shell</include>
+ <include>org.apache.felix:org.apache.felix.metatype</include>
+ <include>org.apache.felix:org.apache.felix.log</include>
+ <include>org.apache.felix:org.apache.felix.shell</include>
+ <include>org.apache.felix:org.apache.felix.shell.tui</include>
+ <include>org.apache.ace:org.apache.ace.managementagent</include>
+ <include>org.amdatu.tenant:org.amdatu.tenant.api</include>
+ <include>org.amdatu.tenant:org.amdatu.tenant.adapter</include>
+ <include>org.amdatu.tenant:org.amdatu.tenant.conf.rp</include>
+ <include>org.amdatu.tenant:org.amdatu.tenant.factory</include>
+
<include>org.amdatu.fileinstall:org.amdatu.fileinstall.autoconf</include>
+
<include>org.amdatu.fileinstall:org.amdatu.fileinstall.tenantconf</include>
+ <include>org.amdatu.deployment:org.amdatu.deployment.autoconf</include>
+
<include>org.amdatu.configadmin:org.amdatu.multitenant.org.apache.felix.configadmin</include>
+
<include>org.amdatu.eventadmin:org.amdatu.multitenant.org.apache.felix.eventadmin</include>
+
<include>org.amdatu.preferences:org.amdatu.multitenant.org.apache.felix.prefs</include>
+
<include>org.amdatu.useradmin:org.amdatu.multitenant.org.ops4j.pax.useradmin.pax-useradmin-service</include>
+
<include>org.amdatu.useradmin:org.amdatu.multitenant.org.amdatu.useradmin.pax.fsstorage</include>
+ <include>org.amdatu.web:org.amdatu.web.dispatcher</include>
+ <include>org.amdatu.web:org.amdatu.web.httpcontext</include>
+
<include>org.amdatu.httpservice:org.amdatu.multitenant.org.apache.felix.http.jetty</include>
+ <include>org.amdatu.web:org.amdatu.web.jaxrs</include>
+
<include>org.amdatu.web:org.amdatu.web.tenantresolver.hostname</include>
+
<include>org.amdatu.web:org.amdatu.web.tenantresolver.parameter</include>
+ <include>org.amdatu.web:org.amdatu.web.wink</include>
+ <include>org.amdatu.web:org.amdatu.web.jsp</include>
+ <include>org.amdatu.web:org.amdatu.web.resource</include>
+ <include>org.amdatu.template:org.amdatu.template.processor</include>
+ </includes>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ </dependencySet>
+
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>deploy</outputDirectory>
+ <includes>
+ <include>org.amdatu.auth:*</include>
+ <include>org.amdatu.opensocial:*</include>
+ <include>org.amdatu.cassandra:*</include>
+ </includes>
+ <excludes>
+ <exclude>org.amdatu.auth:org.amdatu.auth.config</exclude>
+ <exclude>org.amdatu.opensocial:org.amdatu.opensocial.config</exclude>
+ <exclude>org.amdatu.cassandra:org.amdatu.cassandra.config</exclude>
+ </excludes>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ </dependencySet>
+
+ <!--Unpack the the config files to deploy directory -->
+ <dependencySet>
+ <outputDirectory>deploy</outputDirectory>
+ <includes>
+ <include>org.amdatu.auth:org.amdatu.auth.config</include>
+ <include>org.amdatu.opensocial:org.amdatu.opensocial.config</include>
+ <include>org.amdatu.cassandra:org.amdatu.cassandra.config</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ <filtered>true</filtered>
+ </unpackOptions>
+ <outputFileNameMapping></outputFileNameMapping> <!-- MASSEMBLY-533 -->
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory></directory>
+ <outputDirectory></outputDirectory>
+ <filtered>false</filtered>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources/bin</directory>
+ <outputDirectory></outputDirectory>
+ <filtered>true</filtered>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources/conf</directory>
+ <outputDirectory>conf</outputDirectory>
+ <filtered>true</filtered>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources/shortcuts</directory>
+ <outputDirectory></outputDirectory>
+ <filtered>true</filtered>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources/config</directory>
+ <outputDirectory>multitenantweb</outputDirectory>
+ <filtered>true</filtered>
+ </fileSet>
+ </fileSets>
+</component>
\ No newline at end of file
Added: trunk/amdatu-release-demo/src/main/assembly/cassandra-dir.xml
==============================================================================
--- (empty file)
+++ trunk/amdatu-release-demo/src/main/assembly/cassandra-dir.xml Mon May
21 10:16:38 2012
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2010, 2011 The Amdatu Foundation
+
+ Licensed 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.verning 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>cassandra-dir</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <componentDescriptors>
+
<componentDescriptor>src/main/assembly/cassandra-components.xml</componentDescriptor>
+ </componentDescriptors>
+</assembly>
\ No newline at end of file
Added: trunk/amdatu-release-demo/src/main/assembly/cassandra-zip.xml
==============================================================================
--- (empty file)
+++ trunk/amdatu-release-demo/src/main/assembly/cassandra-zip.xml Mon May
21 10:16:38 2012
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2010, 2011 The Amdatu Foundation
+
+ Licensed 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.verning 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>cassandra-bin</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <componentDescriptors>
+
<componentDescriptor>src/main/assembly/cassandra-components.xml</componentDescriptor>
+ </componentDescriptors>
+</assembly>
\ No newline at end of file
Copied: trunk/amdatu-release-demo/src/main/assembly/opensocia-component.xml
(from r2359, /trunk/amdatu-release-demo/src/main/assembly/bin-component.xml)
==============================================================================
--- /trunk/amdatu-release-demo/src/main/assembly/bin-component.xml
(original)
+++ trunk/amdatu-release-demo/src/main/assembly/opensocia-component.xml Mon May
21 10:16:38 2012
@@ -55,43 +55,9 @@
<fileMode>0644</fileMode>
</dependencySet>
- <dependencySet>
+ <dependencySet>
<useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>deploy_auth</outputDirectory>
- <includes>
- <include>org.amdatu.auth:*</include>
- </includes>
- <excludes>
-
<exclude>org.amdatu.auth:org.amdatu.auth.example.oauth.consumer</exclude>
-
<exclude>org.amdatu.auth:org.amdatu.auth.example.oauth.provider</exclude>
- <exclude>org.amdatu.auth:org.amdatu.auth.config</exclude>
- </excludes>
- <unpack>false</unpack>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- </dependencySet>
-
- <!--Unpack the the config files to deploy directory -->
- <dependencySet>
- <outputDirectory>deploy_auth</outputDirectory>
- <includes>
- <include>org.amdatu.auth:org.amdatu.auth.config</include>
- </includes>
- <unpack>true</unpack>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/**</exclude>
- </excludes>
- <filtered>true</filtered>
- </unpackOptions>
- <outputFileNameMapping></outputFileNameMapping> <!-- MASSEMBLY-533 -->
- <useTransitiveDependencies>false</useTransitiveDependencies>
- </dependencySet>
-
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>deploy_opensocial</outputDirectory>
+ <outputDirectory>deploy</outputDirectory>
<includes>
<include>org.amdatu.auth:*</include>
<include>org.amdatu.opensocial:*</include>
@@ -108,7 +74,7 @@
<!--Unpack the the config files to deploy directory -->
<dependencySet>
- <outputDirectory>deploy_opensocial</outputDirectory>
+ <outputDirectory>deploy</outputDirectory>
<includes>
<include>org.amdatu.auth:org.amdatu.auth.config</include>
<include>org.amdatu.opensocial:org.amdatu.opensocial.config</include>
@@ -124,43 +90,6 @@
<useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>deploy_cassandra</outputDirectory>
- <includes>
- <include>org.amdatu.auth:*</include>
- <include>org.amdatu.opensocial:*</include>
- <include>org.amdatu.cassandra:*</include>
- </includes>
- <excludes>
- <exclude>org.amdatu.auth:org.amdatu.auth.config</exclude>
- <exclude>org.amdatu.opensocial:org.amdatu.opensocial.config</exclude>
- <exclude>org.amdatu.cassandra:org.amdatu.cassandra.config</exclude>
- </excludes>
- <unpack>false</unpack>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- </dependencySet>
-
- <!--Unpack the the config files to deploy directory -->
- <dependencySet>
- <outputDirectory>deploy_cassandra</outputDirectory>
- <includes>
- <include>org.amdatu.auth:org.amdatu.auth.config</include>
- <include>org.amdatu.opensocial:org.amdatu.opensocial.config</include>
- <include>org.amdatu.cassandra:org.amdatu.cassandra.config</include>
- </includes>
- <unpack>true</unpack>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/**</exclude>
- </excludes>
- <filtered>true</filtered>
- </unpackOptions>
- <outputFileNameMapping></outputFileNameMapping> <!-- MASSEMBLY-533 -->
- <useTransitiveDependencies>false</useTransitiveDependencies>
- </dependencySet>
</dependencySets>
<fileSets>
<fileSet>
Added: trunk/amdatu-release-demo/src/main/assembly/opensocial-dir.xml
==============================================================================
--- (empty file)
+++ trunk/amdatu-release-demo/src/main/assembly/opensocial-dir.xml Mon May
21 10:16:38 2012
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2010, 2011 The Amdatu Foundation
+
+ Licensed 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.verning 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>dev</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <componentDescriptors>
+
<componentDescriptor>src/main/assembly/opensocial-components.xml</componentDescriptor>
+ </componentDescriptors>
+</assembly>
\ No newline at end of file
Added: trunk/amdatu-release-demo/src/main/assembly/opensocial-zip.xml
==============================================================================
--- (empty file)
+++ trunk/amdatu-release-demo/src/main/assembly/opensocial-zip.xml Mon May
21 10:16:38 2012
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2010, 2011 The Amdatu Foundation
+
+ Licensed 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.verning 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>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <componentDescriptors>
+
<componentDescriptor>src/main/assembly/opensocial-components.xml</componentDescriptor>
+ </componentDescriptors>
+</assembly>
\ No newline at end of file
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
