You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/04/04 17:50:57 UTC
svn commit: r1464603 - in /syncope/branches/1_1_X: pom.xml
standalone/pom.xml standalone/src/assemble/standalone-zip.xml
Author: ilgrosso
Date: Thu Apr 4 15:50:56 2013
New Revision: 1464603
URL: http://svn.apache.org/r1464603
Log:
Improving standalone configuration, with conf working in apache-release maven profile
Modified:
syncope/branches/1_1_X/pom.xml
syncope/branches/1_1_X/standalone/pom.xml
syncope/branches/1_1_X/standalone/src/assemble/standalone-zip.xml
Modified: syncope/branches/1_1_X/pom.xml
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/pom.xml?rev=1464603&r1=1464602&r2=1464603&view=diff
==============================================================================
--- syncope/branches/1_1_X/pom.xml (original)
+++ syncope/branches/1_1_X/pom.xml Thu Apr 4 15:50:56 2013
@@ -1240,7 +1240,6 @@ under the License.
<mavenExecutorId>forked-path</mavenExecutorId>
<autoVersionSubmodules>true</autoVersionSubmodules>
<tagNameFormat>syncope-@{project.version}</tagNameFormat>
- <arguments>-Papache-release</arguments>
</configuration>
</plugin>
</plugins>
Modified: syncope/branches/1_1_X/standalone/pom.xml
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/standalone/pom.xml?rev=1464603&r1=1464602&r2=1464603&view=diff
==============================================================================
--- syncope/branches/1_1_X/standalone/pom.xml (original)
+++ syncope/branches/1_1_X/standalone/pom.xml Thu Apr 4 15:50:56 2013
@@ -90,50 +90,50 @@ under the License.
<phase>verify</phase>
<configuration>
<target>
- <mkdir dir="${work.dir}" />
+ <mkdir dir="${work.dir}"/>
<!-- legal stuff -->
- <copy file="${project.build.outputDirectory}/README" todir="${work.dir}" />
- <copy file="../legal_ext/LICENSE" todir="${work.dir}" />
- <copy file="../legal_ext/NOTICE" todir="${work.dir}" />
+ <copy file="${project.build.outputDirectory}/README" todir="${work.dir}"/>
+ <copy file="../legal_ext/LICENSE" todir="${work.dir}"/>
+ <copy file="../legal_ext/NOTICE" todir="${work.dir}"/>
<!-- Syncope core (as run for integration tests) -->
- <unzip src="${settings.localRepository}/org/codehaus/cargo/cargo-container-archives/apache-tomcat-${tomcat.version}.zip" dest="${work.dir}" />
+ <unzip src="${settings.localRepository}/org/codehaus/cargo/cargo-container-archives/apache-tomcat-${tomcat.version}.zip" dest="${work.dir}"/>
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope">
- <fileset dir="../core/target/syncope-core-test" includes="**/*" />
+ <fileset dir="../core/target/syncope-core-test" includes="**/*"/>
</copy>
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope/WEB-INF/classes" overwrite="true">
- <fileset dir="${project.build.outputDirectory}/core" />
+ <fileset dir="${project.build.outputDirectory}/core"/>
</copy>
<!-- Syncope console (exploded) -->
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-console">
- <fileset dir="../console/target/syncope-console" includes="**/*" />
+ <fileset dir="../console/target/syncope-console" includes="**/*"/>
</copy>
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-console/WEB-INF/classes" overwrite="true">
- <fileset dir="${project.build.outputDirectory}/console" />
+ <fileset dir="${project.build.outputDirectory}/console"/>
</copy>
<!-- ConnId's SOAP wssample (provides endpoint for SOAP resources) -->
- <copy file="${settings.localRepository}/org/connid/bundles/soap/wssample/${connid.soap.version}/wssample-${connid.soap.version}.war" tofile="${work.dir}/apache-tomcat-${tomcat.version}/webapps/wssample.war" />
+ <copy file="${settings.localRepository}/org/connid/bundles/soap/wssample/${connid.soap.version}/wssample-${connid.soap.version}.war" tofile="${work.dir}/apache-tomcat-${tomcat.version}/webapps/wssample.war"/>
<!-- Syncope build tools (provide H2 and Apache DS resources + ConnId connector server) -->
- <unzip src="../build-tools/target/syncope-build-tools-${project.version}.war" dest="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools" />
+ <unzip src="../build-tools/target/syncope-build-tools-${project.version}.war" dest="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools"/>
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools/WEB-INF/lib">
- <fileset dir="../core/target/bundles" includes="**/*" />
+ <fileset dir="../core/target/bundles" includes="**/*"/>
</copy>
- <zip destfile="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools.war" basedir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools" />
- <delete dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools" />
+ <zip destfile="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools.war" basedir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools"/>
+ <delete dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools"/>
<!-- Tomcat shared libraries: H2 and groovy -->
- <copy file="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar" todir="${work.dir}/apache-tomcat-${tomcat.version}/lib" />
- <copy file="${settings.localRepository}/org/codehaus/groovy/groovy-all/${groovy.version}/groovy-all-${groovy.version}.jar" todir="${work.dir}/apache-tomcat-${tomcat.version}/lib" />
+ <copy file="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar" todir="${work.dir}/apache-tomcat-${tomcat.version}/lib"/>
+ <copy file="${settings.localRepository}/org/codehaus/groovy/groovy-all/${groovy.version}/groovy-all-${groovy.version}.jar" todir="${work.dir}/apache-tomcat-${tomcat.version}/lib"/>
<!-- Other custom Tomcat resources -->
- <copy file="../core/target/test-classes/context.xml" todir="${work.dir}/apache-tomcat-${tomcat.version}/conf" overwrite="true" />
- <copy file="src/main/resources/setenv.sh" todir="${work.dir}/apache-tomcat-${tomcat.version}/bin" />
- <copy file="src/main/resources/setenv.bat" todir="${work.dir}/apache-tomcat-${tomcat.version}/bin" />
- <replace file="${work.dir}/apache-tomcat-${tomcat.version}/conf/server.xml" token="8080" value="${cargo.servlet.port}" />
+ <copy file="../core/target/test-classes/context.xml" todir="${work.dir}/apache-tomcat-${tomcat.version}/conf" overwrite="true"/>
+ <copy file="src/main/resources/setenv.sh" todir="${work.dir}/apache-tomcat-${tomcat.version}/bin"/>
+ <copy file="src/main/resources/setenv.bat" todir="${work.dir}/apache-tomcat-${tomcat.version}/bin"/>
+ <replace file="${work.dir}/apache-tomcat-${tomcat.version}/conf/server.xml" token="8080" value="${cargo.servlet.port}"/>
</target>
</configuration>
</execution>
@@ -142,7 +142,6 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <inherited>true</inherited>
<configuration>
<descriptors>
<descriptor>src/assemble/standalone-zip.xml</descriptor>
@@ -151,7 +150,7 @@ under the License.
<executions>
<execution>
<id>make-standalone-zip</id>
- <phase>verify</phase>
+ <phase>install</phase>
<goals>
<goal>single</goal>
</goals>
Modified: syncope/branches/1_1_X/standalone/src/assemble/standalone-zip.xml
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/standalone/src/assemble/standalone-zip.xml?rev=1464603&r1=1464602&r2=1464603&view=diff
==============================================================================
--- syncope/branches/1_1_X/standalone/src/assemble/standalone-zip.xml (original)
+++ syncope/branches/1_1_X/standalone/src/assemble/standalone-zip.xml Thu Apr 4 15:50:56 2013
@@ -1,11 +1,12 @@
+<?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
+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
@@ -15,12 +16,12 @@ software distributed under the License i
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.0"
+<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.0
- http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ 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>
@@ -30,19 +31,6 @@ under the License.
<fileSet>
<directory>${work.dir}</directory>
<outputDirectory>apache-syncope-standalone-${project.version}</outputDirectory>
- <excludes>
- <exclude>**/*.sh</exclude>
- <exclude>**/*.bat</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${work.dir}/apache-tomcat-${tomcat.version}/bin</directory>
- <outputDirectory>apache-syncope-standalone-${project.version}/apache-tomcat-${tomcat.version}/bin</outputDirectory>
- <includes>
- <include>*.sh</include>
- <include>*.bat</include>
- </includes>
- <fileMode>0755</fileMode>
</fileSet>
</fileSets>
</assembly>