On 17/01/2013 15:27, [email protected] wrote:
Author: cschneider
Date: Thu Jan 17 14:27:33 2013
New Revision: 1434684
URL: http://svn.apache.org/viewvc?rev=1434684&view=rev
Log:
SYNCOPE-241 Adding new activiticontent.xml to archetype
Why this activiticontent.xml? Why removing the XSLT dynamic from core
pom.xml?
Moreover: please consider that archetype resources must be copied from
core and console as part of the build process and not statically
committed as you've just did for content.xml and activiticontent.xml.
Regards.
Added:
syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/main/resources/activiticontent.xml
(with props)
Modified:
syncope/trunk/archetype/pom.xml
syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/main/resources/content.xml
Modified: syncope/trunk/archetype/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/archetype/pom.xml?rev=1434684&r1=1434683&r2=1434684&view=diff
==============================================================================
--- syncope/trunk/archetype/pom.xml (original)
+++ syncope/trunk/archetype/pom.xml Thu Jan 17 14:27:33 2013
@@ -141,6 +141,7 @@ under the License.
<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/activiticontent.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" />
<copy file="${basedir}/../core/src/main/webapp/WEB-INF/web.xml"
todir="${basedir}/src/main/resources/archetype-resources/core/src/main/webapp/WEB-INF"
overwrite="true" />
Added:
syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/main/resources/activiticontent.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/main/resources/activiticontent.xml?rev=1434684&view=auto
==============================================================================
---
syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/main/resources/activiticontent.xml
(added)
+++
syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/main/resources/activiticontent.xml
Thu Jan 17 14:27:33 2013
@@ -0,0 +1,26 @@
+<?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.
+
+-->
+<dataset>
+ <ACT_GE_PROPERTY NAME_="schema.version" VALUE_="${activiti.version}"
REV_="1"/>
+ <ACT_GE_PROPERTY NAME_="schema.history" VALUE_="create(${activiti.version})"
REV_="1"/>
+ <ACT_GE_PROPERTY NAME_="next.dbid" VALUE_="1" REV_="1"/>
+ <ACT_GE_PROPERTY NAME_="historyLevel" VALUE_="1" REV_="1"/>
+</dataset>
Propchange:
syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/main/resources/activiticontent.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/main/resources/content.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/main/resources/content.xml?rev=1434684&r1=1434683&r2=1434684&view=diff
==============================================================================
---
syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/main/resources/content.xml
(original)
+++
syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/main/resources/content.xml
Thu Jan 17 14:27:33 2013
@@ -122,8 +122,4 @@ under the License.
<Entitlement name="AUDIT_ENABLE"/>
<Entitlement name="AUDIT_DISABLE"/>
- <ACT_GE_PROPERTY NAME_="schema.version" VALUE_="${activiti.version}"
REV_="1"/>
- <ACT_GE_PROPERTY NAME_="schema.history" VALUE_="create(${activiti.version})"
REV_="1"/>
- <ACT_GE_PROPERTY NAME_="next.dbid" VALUE_="1" REV_="1"/>
- <ACT_GE_PROPERTY NAME_="historyLevel" VALUE_="1" REV_="1"/>
</dataset>
--
Dott. Francesco Chicchiriccò
Tel +393290573276
Amministratore unico @ Tirasa S.r.l.
Viale D'Annunzio 267 - 65127 Pescara
Tel +39 0859116307 / FAX +39 0859111173
http://www.tirasa.net
ASF Member, Apache Syncope PMC chair, Apache Cocoon PMC Member
http://people.apache.org/~ilgrosso/
"To Iterate is Human, to Recurse, Divine"
(James O. Coplien, Bell Labs)
--
Francesco Chicchiriccò
ASF Member, Apache Syncope PMC chair, Apache Cocoon PMC Member
http://people.apache.org/~ilgrosso/
