Author: gk
Date: Fri Apr  6 14:35:05 2018
New Revision: 1828528

URL: http://svn.apache.org/viewvc?rev=1828528&view=rev
Log:
- remove snapshot
- add license header
- update comment in component xml 

Modified:
    
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml
    
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/wrapper/TurbineUserWrapper.java
    
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml

Modified: 
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml
URL: 
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml?rev=1828528&r1=1828527&r2=1828528&view=diff
==============================================================================
--- 
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml
 (original)
+++ 
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml
 Fri Apr  6 14:35:05 2018
@@ -374,9 +374,9 @@ under the License.
         <maven.compile.target>1.6</maven.compile.target>
         <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
         <fulcrum.json>1.1.1</fulcrum.json>
-        <fulcrum.intake>1.2.3-SNAPSHOT</fulcrum.intake>
+        <fulcrum.intake>1.2.3</fulcrum.intake>
         <fulcrum.security>1.1.2</fulcrum.security>
-        <turbine.core>4.0.1-SNAPSHOT</turbine.core>
+        <turbine.core>4.0.1</turbine.core>
         <slf4j.version>1.7.25</slf4j.version>
         <skipTests>true</skipTests>
     </properties>

Modified: 
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/wrapper/TurbineUserWrapper.java
URL: 
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/wrapper/TurbineUserWrapper.java?rev=1828528&r1=1828527&r2=1828528&view=diff
==============================================================================
--- 
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/wrapper/TurbineUserWrapper.java
 (original)
+++ 
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/wrapper/TurbineUserWrapper.java
 Fri Apr  6 14:35:05 2018
@@ -1,5 +1,21 @@
 package ${package}.wrapper;
 
+/*
+ * Copyright 2001-2017 The Apache Software 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.
+ */
+ 
 import org.apache.fulcrum.security.model.turbine.entity.TurbineUser;
 import org.apache.turbine.om.security.DefaultUserImpl;
 

Modified: 
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml
URL: 
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml?rev=1828528&r1=1828527&r2=1828528&view=diff
==============================================================================
--- 
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml
 (original)
+++ 
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml
 Fri Apr  6 14:35:05 2018
@@ -132,16 +132,16 @@
      <userManager>
         <className>${package}.om.TurbineUser</className>
         <peerClassName>${package}.om.TurbineUserPeerImpl</peerClassName>
-        <userGroupRoleManager>
+        <userGroupRoleManager><!-- using custom peers requires now since 
fulcrum security 1.1.2 this element -->
                <!-- 
className>org.apache.fulcrum.security.torque.om.TurbineUserGroupRole</className-->
                
<peerClassName>${package}.om.TurbineUserGroupRolePeerImpl</peerClassName>
            </userGroupRoleManager>
     </userManager>
-    <groupManager>
+    <groupManager><!-- might have lazy="true" attribute -->
         <className>${package}.om.TurbineGroup</className>
         <peerClassName>${package}.om.TurbineGroupPeerImpl</peerClassName>
     </groupManager>
-    <roleManager>
+    <roleManager><!-- might have lazy="true" attribute -->
         <className>${package}.om.TurbineRole</className>
         <peerClassName>${package}.om.TurbineRolePeerImpl</peerClassName>
     </roleManager>


Reply via email to