Author: gk
Date: Fri Apr 17 06:41:45 2015
New Revision: 1674219
URL: http://svn.apache.org/r1674219
Log:
- Updated schema
- Using default memory
- Add jetty plugin to check/test quickly
Added:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineConfigurationBuilder.xml
(with props)
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/usersettings.properties
(with props)
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/torque-schema/application-schema.xml
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/id-table-schema.xml
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/roleConfiguration.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=1674219&r1=1674218&r2=1674219&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 17 06:41:45 2015
@@ -137,6 +137,24 @@ under the License.
<!--
containerConfigXML>WEB-INF/build/context.xml</containerConfigXML -->
</configuration>
</plugin>
+
+ <!-- jetty:run checks deployed war http://localhost:8081/app/ -->
+ <plugin>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>9.2.9.v20150224</version>
+ <configuration>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ <httpConnector>
+ <port>8081</port>
+ <host>localhost</host>
+ <idleTimeout>60000</idleTimeout>
+ </httpConnector>
+ <!--webApp>
+ <contextPath>/app</contextPath>
+ </webApp-->
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -144,13 +162,13 @@ under the License.
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
- <version>1.1</version>
+ <version>1.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4.1</version>
+ <version>1.4.5</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/application-schema.xml
URL:
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/application-schema.xml?rev=1674219&r1=1674218&r2=1674219&view=diff
==============================================================================
---
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/application-schema.xml
(original)
+++
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/application-schema.xml
Fri Apr 17 06:41:45 2015
@@ -17,12 +17,7 @@
specific language governing permissions and limitations
under the License.
*#
-<database name="${turbine_database_name}"
- defaultIdMethod="none"
- xmlns="http://db.apache.org/torque/4.0/templates/database";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database
- http://db.apache.org/torque/4.0/templates/database.xsd";>
+<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_3.dtd";>
<!--
==============================================================================
-->
<!--
-->
@@ -31,6 +26,8 @@
<!-- @version $Id: application-schema.xml 615328 2008-01-25 20:25:05Z tv $
-->
<!--
-->
<!--
==============================================================================
-->
+
+<database name="${turbine_database_name}">
<table name="table1">
<column name="test_col1" type="INTEGER" />
<column name="test_col2" type="VARCHAR" size="10" />
Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/id-table-schema.xml
URL:
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/id-table-schema.xml?rev=1674219&r1=1674218&r2=1674219&view=diff
==============================================================================
---
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/id-table-schema.xml
(original)
+++
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/id-table-schema.xml
Fri Apr 17 06:41:45 2015
@@ -17,13 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<database name="@DATABASE_DEFAULT@"
- defaultIdMethod="idbroker"
- defaultJavaType="primitive"
- xmlns="http://db.apache.org/torque/4.0/templates/database";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database
- http://db.apache.org/torque/4.0/templates/database.xsd";>
+<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_3.dtd";>
<!-- =========================================================================
-->
<!--
-->
@@ -33,6 +27,11 @@
<!--
-->
<!-- =========================================================================
-->
+<database name="@DATABASE_DEFAULT@"
+ defaultIdMethod="idbroker"
+ defaultJavaType="primitive"
+ defaultJavaNamingMethod="underscore"
+ package="@DATABASE_PACKAGE@">
<table name="ID_TABLE" idMethod="idbroker">
<column name="ID_TABLE_ID" required="true" primaryKey="true"
type="INTEGER" javaName="IdTableId"/>
<column name="TABLE_NAME" required="true" size="255" type="VARCHAR"
javaName="TableName"/>
Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml
URL:
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml?rev=1674219&r1=1674218&r2=1674219&view=diff
==============================================================================
---
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml
(original)
+++
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml
Fri Apr 17 06:41:45 2015
@@ -17,12 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<database name="${turbine_database_name}"
- defaultIdMethod="none"
- xmlns="http://db.apache.org/torque/4.0/templates/database";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database
- http://db.apache.org/torque/4.0/templates/database.xsd";>
+<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_3.dtd";>
<!-- ========================================================================
-->
<!--
-->
@@ -32,6 +27,7 @@
<!--
-->
<!-- ========================================================================
-->
+<database name="${turbine_database_name}">
<table name="TURBINE_PERMISSION" idMethod="idbroker">
<column name="PERMISSION_ID" required="true" primaryKey="true"
type="INTEGER"/>
@@ -84,7 +80,7 @@
<column name="LAST_NAME" required="true" size="64" type="VARCHAR"/>
<column name="EMAIL" size="64" type="VARCHAR"/>
<column name="CONFIRM_VALUE" size="16" type="VARCHAR"
javaName="Confirmed"/>
- <column name="MODIFIED" type="TIMESTAMP" javaName="ModifiedDate"/>
+ <column name="MODIFIED" type="TIMESTAMP"/>
<column name="CREATED" type="TIMESTAMP" javaName="CreateDate"/>
<column name="LAST_LOGIN" type="TIMESTAMP"/>
<column name="OBJECTDATA" type="VARBINARY"/>
Added:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineConfigurationBuilder.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/TurbineConfigurationBuilder.xml?rev=1674219&view=auto
==============================================================================
---
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineConfigurationBuilder.xml
(added)
+++
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineConfigurationBuilder.xml
Fri Apr 17 06:41:45 2015
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<configuration>
+ <header>
+ <!-- Meta data about the resulting combined configuration -->
+ </header>
+ <override><!-- only allowed configurations are user and turbine, realtive
paths -->
+ <properties config-name="user"
fileName="WEB-INF/conf/usersettings.properties" config-optional="true"
config-forceCreate="true"/>
+ <!-- xml fileName="conf/test/TurbineResources.xml"/-->
+ <properties config-name="turbine"
fileName="WEB-INF/conf/TurbineResources.properties"
throwExceptionOnMissing="true"/>
+ </override>
+ <additional>
+ <!-- Configuration declarations that form a union configuration, always
provide a unique config-name attribute -->
+ </additional>
+</configuration>
\ No newline at end of file
Propchange:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineConfigurationBuilder.xml
------------------------------------------------------------------------------
svn:eol-style = native
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=1674219&r1=1674218&r2=1674219&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 17 06:41:45 2015
@@ -22,23 +22,6 @@
<torque>
<configfile>/WEB-INF/conf/Torque.properties</configfile>
</torque>
- <userManager>
-
<className>org.apache.fulcrum.security.torque.om.TorqueTurbineUser</className>
-
<peerClassName>org.apache.fulcrum.security.torque.om.TorqueTurbineUserPeer</peerClassName>
- </userManager>
- <groupManager>
-
<className>org.apache.fulcrum.security.torque.om.TorqueTurbineGroup</className>
-
<peerClassName>org.apache.fulcrum.security.torque.om.TorqueTurbineGroupPeerImpl</peerClassName>
- </groupManager>
- <roleManager>
-
<className>org.apache.fulcrum.security.torque.om.TorqueTurbineRole</className>
-
<peerClassName>org.apache.fulcrum.security.torque.om.TorqueTurbineRolePeerImpl</peerClassName>
- </roleManager>
- <permissionManager>
-
<className>org.apache.fulcrum.security.torque.om.TorqueTurbinePermission</className>
-
<peerClassName>org.apache.fulcrum.security.torque.om.TorqueTurbinePermissionPeerImpl</peerClassName>
- </permissionManager>
- <peerManager/>
<cache cacheInitialSize="20" cacheCheckFrequency="5"/>
<mimetype/>
<crypto>
@@ -67,4 +50,21 @@
<automaticUpload>true</automaticUpload>
</parser>
<upload repository="/tmp" sizeMax="1048576" sizeThreshold="10240"/>
+ <!-- These components belong to the Fulcrum-Security services -->
+ <securityService/>
+ <authenticator/>
+ <modelManager/>
+ <aclFactory/>
+ <userManager>
+
<className>org.apache.fulcrum.security.model.turbine.entity.impl.TurbineUserImpl</className>
+ </userManager>
+ <groupManager>
+
<className>org.apache.fulcrum.security.model.turbine.entity.impl.TurbineGroupImpl</className>
+ </groupManager>
+ <roleManager>
+
<className>org.apache.fulcrum.security.model.turbine.entity.impl.TurbineRoleImpl</className>
+ </roleManager>
+ <permissionManager>
+
<className>org.apache.fulcrum.security.model.turbine.entity.impl.TurbinePermissionImpl</className>
+ </permissionManager>
</componentConfig>
\ No newline at end of file
Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/roleConfiguration.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/roleConfiguration.xml?rev=1674219&r1=1674218&r2=1674219&view=diff
==============================================================================
---
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/roleConfiguration.xml
(original)
+++
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/roleConfiguration.xml
Fri Apr 17 06:41:45 2015
@@ -74,31 +74,47 @@
shorthand="xslt"
default-class="org.apache.fulcrum.xslt.DefaultXSLTService"/>
+ <!-- These components belong to the Fulcrum-Security services -->
<role
name="org.apache.fulcrum.security.SecurityService"
shorthand="securityService"
default-class="org.apache.fulcrum.security.BaseSecurityService"/>
- <role
+
+ <role
name="org.apache.fulcrum.security.UserManager"
shorthand="userManager"
early-init="true"
default-class="org.apache.fulcrum.security.memory.turbine.MemoryTurbineUserManagerImpl"/>
+
<role
name="org.apache.fulcrum.security.GroupManager"
shorthand="groupManager"
-
default-class="org.apache.fulcrum.security.torque.turbine.TorqueTurbineGroupManagerImpl"/>
+
default-class="org.apache.fulcrum.security.memory.MemoryGroupManagerImpl"/>
+
<role
name="org.apache.fulcrum.security.RoleManager"
shorthand="roleManager"
-
default-class="org.apache.fulcrum.security.torque.turbine.TorqueTurbineRoleManagerImpl"/>
+
default-class="org.apache.fulcrum.security.memory.MemoryRoleManagerImpl"/>
+
<role
name="org.apache.fulcrum.security.PermissionManager"
shorthand="permissionManager"
-
default-class="org.apache.fulcrum.security.torque.turbine.TorqueTurbinePermissionManagerImpl"/>
+
default-class="org.apache.fulcrum.security.memory.MemoryPermissionManagerImpl"/>
+
<role
name="org.apache.fulcrum.security.ModelManager"
shorthand="modelManager"
default-class="org.apache.fulcrum.security.memory.turbine.MemoryTurbineModelManagerImpl"/>
+ <role
+ name="org.apache.fulcrum.security.authenticator.Authenticator"
+ shorthand="authenticator"
+
default-class="org.apache.fulcrum.security.authenticator.TextMatchAuthenticator"/>
+
+ <role
+ name="org.apache.fulcrum.security.model.ACLFactory"
+ shorthand="aclFactory"
+
default-class="org.apache.fulcrum.security.model.turbine.TurbineACLFactory"/>
+
<!-- Add your services here -->
</role-list>
\ No newline at end of file
Added:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/usersettings.properties
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/usersettings.properties?rev=1674219&view=auto
==============================================================================
(empty)
Propchange:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/usersettings.properties
------------------------------------------------------------------------------
svn:eol-style = native
