Author: ilgrosso
Date: Mon Dec 24 10:29:43 2012
New Revision: 1425623
URL: http://svn.apache.org/viewvc?rev=1425623&view=rev
Log:
Restoring the original procedure for archetype resources, dynamically copied
from core and console during the build process but currently statically
committed as plain files
Removed:
syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/main/resources/META-INF/
syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/test/resources/security.properties
syncope/trunk/core/src/test/resources/security.properties
Modified:
syncope/trunk/archetype/pom.xml
syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml
syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml
syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/main/resources/
(props changed)
syncope/trunk/console/pom.xml
syncope/trunk/core/pom.xml
Modified: syncope/trunk/archetype/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/archetype/pom.xml?rev=1425623&r1=1425622&r2=1425623&view=diff
==============================================================================
--- syncope/trunk/archetype/pom.xml (original)
+++ syncope/trunk/archetype/pom.xml Mon Dec 24 10:29:43 2012
@@ -139,6 +139,7 @@ under the License.
<copy
file="${basedir}/../core/src/main/resources/persistence.properties"
todir="${basedir}/src/main/resources/archetype-resources/core/src/main/resources"
overwrite="true" />
<copy
file="${basedir}/../core/src/main/resources/workflow.properties"
todir="${basedir}/src/main/resources/archetype-resources/core/src/main/resources"
overwrite="true" />
+ <copy
file="${basedir}/../core/src/main/resources/security.properties"
todir="${basedir}/src/main/resources/archetype-resources/core/src/main/resources"
overwrite="true" />
<copy
file="${basedir}/../core/src/main/resources/content.xml"
todir="${basedir}/src/main/resources/archetype-resources/core/src/main/resources"
overwrite="true" />
<copy
file="${basedir}/../core/src/main/resources/logback.xml"
todir="${basedir}/src/main/resources/archetype-resources/core/src/main/resources"
overwrite="true" />
<copy
file="${basedir}/../core/src/main/resources/META-INF/spring-persistence.xml"
todir="${basedir}/src/main/resources/archetype-resources/core/src/main/resources/META-INF"
overwrite="true" />
@@ -153,6 +154,7 @@ under the License.
<else>
<get
src="${SVNRepoURL}/core/src/test/resources/persistence.properties"
dest="${basedir}/src/main/resources/archetype-resources/core/src/test/resources/persistence.properties"
/>
<get
src="${SVNRepoURL}/core/src/test/resources/workflow.properties"
dest="${basedir}/src/main/resources/archetype-resources/core/src/test/resources/workflow.properties"
/>
+ <get
src="${SVNRepoURL}/core/src/test/resources/security.properties"
dest="${basedir}/src/main/resources/archetype-resources/core/src/test/resources/security.properties"
/>
<get
src="${SVNRepoURL}/core/src/test/resources/content.xml"
dest="${basedir}/src/main/resources/archetype-resources/core/src/test/resources/content.xml"
/>
<get src="${SVNRepoURL}/core/src/test/resources/test.csv"
dest="${basedir}/src/main/resources/archetype-resources/core/src/test/resources/test.csv"
/>
<get src="${SVNRepoURL}/core/src/test/resources/db.jsp"
dest="${basedir}/src/main/resources/archetype-resources/core/src/test/resources/db.jsp"
/>
Modified:
syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml?rev=1425623&r1=1425622&r2=1425623&view=diff
==============================================================================
---
syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml
(original)
+++
syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml
Mon Dec 24 10:29:43 2012
@@ -186,7 +186,6 @@ under the License.
<patternset>
<exclude name="**/content.xml" />
<exclude name="**/persistence.properties" />
- <exclude name="**/security.properties" />
<exclude name="**/workflow.properties" />
</patternset>
</unzip>
Modified:
syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml?rev=1425623&r1=1425622&r2=1425623&view=diff
==============================================================================
--- syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml
(original)
+++ syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml
Mon Dec 24 10:29:43 2012
@@ -200,7 +200,6 @@ under the License.
<patternset>
<exclude name="**/content.xml"/>
<exclude name="**/persistence.properties"/>
- <exclude name="**/security.properties"/>
<exclude name="**/workflow.properties" />
</patternset>
</unzip>
Propchange:
syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/main/resources/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Dec 24 10:29:43 2012
@@ -1,6 +1,6 @@
persistence.properties
logback.xml
workflow.properties
+security.properties
content.xml
META-INF
-.content.xml.swp
Modified: syncope/trunk/console/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/pom.xml?rev=1425623&r1=1425622&r2=1425623&view=diff
==============================================================================
--- syncope/trunk/console/pom.xml (original)
+++ syncope/trunk/console/pom.xml Mon Dec 24 10:29:43 2012
@@ -232,7 +232,6 @@ under the License.
<patternset>
<exclude name="**/content.xml" />
<exclude name="**/persistence.properties" />
- <exclude name="**/security.properties" />
<exclude name="**/workflow.properties" />
</patternset>
</unzip>
Modified: syncope/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/pom.xml?rev=1425623&r1=1425622&r2=1425623&view=diff
==============================================================================
--- syncope/trunk/core/pom.xml (original)
+++ syncope/trunk/core/pom.xml Mon Dec 24 10:29:43 2012
@@ -435,7 +435,6 @@ under the License.
<patternset>
<exclude name="**/content.xml" />
<exclude name="**/persistence.properties" />
- <exclude name="**/security.properties" />
<exclude name="**/workflow.properties" />
</patternset>
</unzip>
