Author: [email protected]
Date: Mon May 21 10:24:08 2012
New Revision: 2364
Log:
[AMDATUOPENSOCIAL-209] Separated assemblies
Added:
trunk/amdatu-release-demo/src/main/assembly/auth.xml
- copied, changed from r2363,
/trunk/amdatu-release-demo/src/main/assembly/auth-dir.xml
trunk/amdatu-release-demo/src/main/assembly/cassandra.xml
- copied, changed from r2363,
/trunk/amdatu-release-demo/src/main/assembly/cassandra-dir.xml
trunk/amdatu-release-demo/src/main/assembly/opensocial-components.xml
- copied unchanged from r2363,
/trunk/amdatu-release-demo/src/main/assembly/opensocia-component.xml
trunk/amdatu-release-demo/src/main/resources/bin/run.bat
- copied, changed from r2359,
/trunk/amdatu-release-demo/src/main/resources/bin/run_auth.bat
Modified:
trunk/amdatu-release-demo/pom.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-dir.xml
trunk/amdatu-release-demo/src/main/assembly/cassandra-zip.xml
trunk/amdatu-release-demo/src/main/assembly/opensocia-component.xml
trunk/amdatu-release-demo/src/main/assembly/opensocial-dir.xml
trunk/amdatu-release-demo/src/main/assembly/opensocial-zip.xml
trunk/amdatu-release-demo/src/main/resources/bin/run_auth.bat
trunk/amdatu-release-demo/src/main/resources/bin/run_cassandra.bat
trunk/amdatu-release-demo/src/main/resources/bin/run_opensocial.bat
Modified: trunk/amdatu-release-demo/pom.xml
==============================================================================
--- trunk/amdatu-release-demo/pom.xml (original)
+++ trunk/amdatu-release-demo/pom.xml Mon May 21 10:24:08 2012
@@ -635,15 +635,12 @@
<goal>single</goal>
</goals>
<configuration>
- <finalName>demo-${project.version}</finalName>
+ <finalName>demo</finalName>
<appendAssemblyId>true</appendAssemblyId>
<descriptors>
- <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>
+ <descriptor>src/main/assembly/auth.xml</descriptor>
+ <descriptor>src/main/assembly/opensocial.xml</descriptor>
+ <descriptor>src/main/assembly/cassandra.xml</descriptor>
</descriptors>
</configuration>
</execution>
Copied: trunk/amdatu-release-demo/src/main/assembly/auth.xml (from r2363,
/trunk/amdatu-release-demo/src/main/assembly/auth-dir.xml)
==============================================================================
--- /trunk/amdatu-release-demo/src/main/assembly/auth-dir.xml (original)
+++ trunk/amdatu-release-demo/src/main/assembly/auth.xml Mon May 21
10:24:08 2012
@@ -17,9 +17,10 @@
-->
<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>
+ <id>auth-${project.version}</id>
<formats>
<format>dir</format>
+ <format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<componentDescriptors>
Copied: trunk/amdatu-release-demo/src/main/assembly/cassandra.xml (from r2363,
/trunk/amdatu-release-demo/src/main/assembly/cassandra-dir.xml)
==============================================================================
--- /trunk/amdatu-release-demo/src/main/assembly/cassandra-dir.xml
(original)
+++ trunk/amdatu-release-demo/src/main/assembly/cassandra.xml Mon May 21
10:24:08 2012
@@ -17,9 +17,10 @@
-->
<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>
+ <id>cassandra</id>
<formats>
<format>dir</format>
+ <format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<componentDescriptors>
Modified: trunk/amdatu-release-demo/src/main/assembly/opensocial-dir.xml
==============================================================================
--- trunk/amdatu-release-demo/src/main/assembly/opensocial-dir.xml
(original)
+++ trunk/amdatu-release-demo/src/main/assembly/opensocial-dir.xml Mon May
21 10:24:08 2012
@@ -17,7 +17,7 @@
-->
<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>
+ <id>opensocial-dir</id>
<formats>
<format>dir</format>
</formats>
Modified: trunk/amdatu-release-demo/src/main/assembly/opensocial-zip.xml
==============================================================================
--- trunk/amdatu-release-demo/src/main/assembly/opensocial-zip.xml
(original)
+++ trunk/amdatu-release-demo/src/main/assembly/opensocial-zip.xml Mon May
21 10:24:08 2012
@@ -17,7 +17,7 @@
-->
<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>
+ <id>opensocial</id>
<formats>
<format>tar.gz</format>
<format>zip</format>
Copied: trunk/amdatu-release-demo/src/main/resources/bin/run.bat (from r2359,
/trunk/amdatu-release-demo/src/main/resources/bin/run_auth.bat)
==============================================================================
--- /trunk/amdatu-release-demo/src/main/resources/bin/run_auth.bat
(original)
+++ trunk/amdatu-release-demo/src/main/resources/bin/run.bat Mon May 21
10:24:08 2012
@@ -15,7 +15,7 @@
echo Starting Amdatu server
echo JAVA_OPTS=%JAVA_OPTS%
-set JAVA_OPTS=%JAVA_OPTS% -Dfelix.fileinstall.dir=deploy_auth,multitenantweb
+set JAVA_OPTS=%JAVA_OPTS% -Dfelix.fileinstall.dir=deploy,multitenantweb
java %JAVA_OPTS% -jar
lib/org.apache.felix.main-${org.apache.felix.main.version}.jar
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
