You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2011/08/30 22:09:35 UTC

svn commit: r1163364 - in /turbine/fulcrum/trunk/security: ./ api/ api/src/changes/ api/src/site/ hibernate/ hibernate/src/site/ hibernate/xdocs/ memory/ memory/src/site/ memory/xdocs/ nt/ nt/src/site/ nt/xdocs/ src/ src/site/ torque/ torque/schema/ to...

Author: tv
Date: Tue Aug 30 20:09:33 2011
New Revision: 1163364

URL: http://svn.apache.org/viewvc?rev=1163364&view=rev
Log:
Move build and site generation to Maven2

Added:
    turbine/fulcrum/trunk/security/hibernate/src/site/
    turbine/fulcrum/trunk/security/hibernate/src/site/site.xml   (with props)
    turbine/fulcrum/trunk/security/memory/src/site/
    turbine/fulcrum/trunk/security/memory/src/site/site.xml   (with props)
    turbine/fulcrum/trunk/security/nt/src/site/
    turbine/fulcrum/trunk/security/nt/src/site/site.xml   (with props)
    turbine/fulcrum/trunk/security/pom.xml   (with props)
    turbine/fulcrum/trunk/security/src/
    turbine/fulcrum/trunk/security/src/site/
    turbine/fulcrum/trunk/security/src/site/site.xml   (with props)
    turbine/fulcrum/trunk/security/torque/pom.xml   (with props)
    turbine/fulcrum/trunk/security/torque/src/site/
    turbine/fulcrum/trunk/security/torque/src/site/site.xml   (with props)
Modified:
    turbine/fulcrum/trunk/security/api/pom.xml
    turbine/fulcrum/trunk/security/api/src/changes/changes.xml
    turbine/fulcrum/trunk/security/api/src/site/site.xml
    turbine/fulcrum/trunk/security/hibernate/pom.xml
    turbine/fulcrum/trunk/security/hibernate/xdocs/
    turbine/fulcrum/trunk/security/memory/pom.xml
    turbine/fulcrum/trunk/security/memory/xdocs/
    turbine/fulcrum/trunk/security/nt/maven.xml
    turbine/fulcrum/trunk/security/nt/pom.xml
    turbine/fulcrum/trunk/security/nt/project.properties
    turbine/fulcrum/trunk/security/nt/project.xml
    turbine/fulcrum/trunk/security/nt/xdocs/
    turbine/fulcrum/trunk/security/torque/maven.xml
    turbine/fulcrum/trunk/security/torque/project.properties
    turbine/fulcrum/trunk/security/torque/project.xml
    turbine/fulcrum/trunk/security/torque/schema/fulcrum-basic-schema.xml
    turbine/fulcrum/trunk/security/torque/schema/fulcrum-dynamic-schema.xml
    turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml
    turbine/fulcrum/trunk/security/torque/schema/id-table-schema.xml
    turbine/fulcrum/trunk/security/torque/xdocs/
    turbine/fulcrum/trunk/security/xdocs/navigation.xml

Modified: turbine/fulcrum/trunk/security/api/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/pom.xml?rev=1163364&r1=1163363&r2=1163364&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/pom.xml (original)
+++ turbine/fulcrum/trunk/security/api/pom.xml Tue Aug 30 20:09:33 2011
@@ -17,9 +17,9 @@
 -->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <parent>
-        <artifactId>fulcrum-parent</artifactId>
+        <artifactId>fulcrum-security-parent</artifactId>
         <groupId>org.apache.fulcrum</groupId>
-        <version>1</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.fulcrum</groupId>

Modified: turbine/fulcrum/trunk/security/api/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/changes/changes.xml?rev=1163364&r1=1163363&r2=1163364&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/changes/changes.xml (original)
+++ turbine/fulcrum/trunk/security/api/src/changes/changes.xml Tue Aug 30 20:09:33 2011
@@ -35,7 +35,7 @@
         Changed BasicUser, BasicGroup, DynamicUser, DynamicGroup, DynamicRole,
         DynamicPermission, TurbineUser, TurbineGroup, TurbineRole and TurbinePermission to
         interfaces. Added default implementations for existing security services.
-        Changed all occurences of these classes to use BasicUserImpl, BasicGroupImpl,
+        Changed all occurrences of these classes to use BasicUserImpl, BasicGroupImpl,
         DynamicUserImpl, DynamicGroupImpl, DynamicRoleImpl, DynamicPermissionImpl,
         TurbineUserImpl, TurbineGroupImpl, TurbineRoleImpl and TurbinePermissionImpl instead.
       </action>

Modified: turbine/fulcrum/trunk/security/api/src/site/site.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/site/site.xml?rev=1163364&r1=1163363&r2=1163364&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/security/api/src/site/site.xml Tue Aug 30 20:09:33 2011
@@ -19,27 +19,10 @@
 -->
 <project
   name="Fulcrum Security API"
-  href="http://turbine.apache.org/fulcrum/security/api/">
+  href="http://turbine.apache.org/fulcrum/fulcrum-security-api/">
 
 <body>
 
-    <menu name="Overview">
-      <item name="Main"                 href="http://turbine.apache.org/fulcrum/fulcrum-security-site/"/>
-      <item name="Authenticators"       href="http://turbine.apache.org/fulcrum/fulcrum-security-site/authenticators.html"/>
-      <item name="Tasks"                href="http://turbine.apache.org/fulcrum/fulcrum-security-site/tasks.html"/>
-    </menu>
-
-    <menu name="Security Components">
-        <item name="Site"                  href="http://turbine.apache.org/fulcrum/fulcrum-security-site/"/>
-        <item name="Security API"          href="http://turbine.apache.org/fulcrum/fulcrum-security-api/"/>
-        <item name="Memory Impl"           href="http://turbine.apache.org/fulcrum/fulcrum-security-memory/"/>
-        <item name="Hibernate Impl"        href="http://turbine.apache.org/fulcrum/fulcrum-security-hibernate/"/>
-        <item name="Torque Impl"           href="http://turbine.apache.org/fulcrum/fulcrum-security-torque/"/>
-        <item name="NT Impl"               href="http://turbine.apache.org/fulcrum/fulcrum-security-nt/"/>
-        <item name="Adapter Turbine"       href="http://turbine.apache.org/fulcrum/fulcrum-security-adapter-turbine/"/>
-        <item name="Adapter OpenSymphony"  href="http://turbine.apache.org/fulcrum/fulcrum-security-adapter-opensymphony/"/>
-    </menu>
-
 </body>
 
 </project>

Modified: turbine/fulcrum/trunk/security/hibernate/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/pom.xml?rev=1163364&r1=1163363&r2=1163364&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/hibernate/pom.xml (original)
+++ turbine/fulcrum/trunk/security/hibernate/pom.xml Tue Aug 30 20:09:33 2011
@@ -21,15 +21,16 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
     xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <parent>
-        <artifactId>fulcrum-parent</artifactId>
+        <artifactId>fulcrum-security-parent</artifactId>
         <groupId>org.apache.fulcrum</groupId>
-        <version>1</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.fulcrum</groupId>
     <artifactId>fulcrum-security-hibernate</artifactId>
     <name>Fulcrum Security Hibernate Impl</name>
     <version>1.1.0-SNAPSHOT</version>
+    <url>http://turbine.apache.org/fulcrum/fulcrum-security-hibernate/</url>
     <build>
         <sourceDirectory>${basedir}/src/java/</sourceDirectory>
         <testSourceDirectory>${basedir}/src/test/</testSourceDirectory>

Added: turbine/fulcrum/trunk/security/hibernate/src/site/site.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/src/site/site.xml?rev=1163364&view=auto
==============================================================================
--- turbine/fulcrum/trunk/security/hibernate/src/site/site.xml (added)
+++ turbine/fulcrum/trunk/security/hibernate/src/site/site.xml Tue Aug 30 20:09:33 2011
@@ -0,0 +1,28 @@
+<?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.
+-->
+<project
+  name="Fulcrum Security Hibernate Implementation"
+  href="http://turbine.apache.org/fulcrum/fulcrum-security-hibernate/">
+
+<body>
+
+</body>
+
+</project>

Propchange: turbine/fulcrum/trunk/security/hibernate/src/site/site.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: turbine/fulcrum/trunk/security/memory/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/pom.xml?rev=1163364&r1=1163363&r2=1163364&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/memory/pom.xml (original)
+++ turbine/fulcrum/trunk/security/memory/pom.xml Tue Aug 30 20:09:33 2011
@@ -17,9 +17,9 @@
 -->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <parent>
-        <artifactId>fulcrum-parent</artifactId>
+        <artifactId>fulcrum-security-parent</artifactId>
         <groupId>org.apache.fulcrum</groupId>
-        <version>1</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.fulcrum</groupId>
@@ -27,6 +27,7 @@
     <name>Fulcrum Security Memory Impl</name>
     <version>1.1.0-SNAPSHOT</version>
     
+    <url>http://turbine.apache.org/fulcrum/fulcrum-security-memory</url>
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/memory/</connection>
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/memory/</developerConnection>

Added: turbine/fulcrum/trunk/security/memory/src/site/site.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/site/site.xml?rev=1163364&view=auto
==============================================================================
--- turbine/fulcrum/trunk/security/memory/src/site/site.xml (added)
+++ turbine/fulcrum/trunk/security/memory/src/site/site.xml Tue Aug 30 20:09:33 2011
@@ -0,0 +1,28 @@
+<?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.
+-->
+<project
+  name="Fulcrum Security Memory Implementation"
+  href="http://turbine.apache.org/fulcrum/fulcrum-security-memory/">
+
+<body>
+
+</body>
+
+</project>

Propchange: turbine/fulcrum/trunk/security/memory/src/site/site.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: turbine/fulcrum/trunk/security/nt/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/nt/pom.xml?rev=1163364&r1=1163363&r2=1163364&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/nt/pom.xml (original)
+++ turbine/fulcrum/trunk/security/nt/pom.xml Tue Aug 30 20:09:33 2011
@@ -1,21 +1,38 @@
 <?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.
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<parent>
-		<artifactId>fulcrum-parent</artifactId>
+		<artifactId>fulcrum-security-parent</artifactId>
 		<groupId>org.apache.fulcrum</groupId>
-		<version>1</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
-  <groupId>fulcrum-security-nt</groupId>
+  <groupId>org.apache.fulcrum</groupId>
   <artifactId>fulcrum-security-nt</artifactId>
   <name>Fulcrum Security NT Impl</name>
   <version>1.1.0-SNAPSHOT</version>
+  <url>http://turbine.apache.org/fulcrum/fulcrum-security-nt</url>
   <dependencies>
     <dependency>
-      <groupId>fulcrum</groupId>
+      <groupId>org.apache.fulcrum</groupId>
       <artifactId>fulcrum-security-api</artifactId>
-      <version>1.0.7</version>
+      <version>1.1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>tagishauth</groupId>
@@ -23,9 +40,10 @@
       <version>1.0.3</version>
     </dependency>
     <dependency>
-      <groupId>fulcrum</groupId>
+      <groupId>org.apache.fulcrum</groupId>
       <artifactId>fulcrum-security-memory</artifactId>
-      <version>1.0.7</version>
+      <version>1.1.0-SNAPSHOT</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -41,14 +59,4 @@
     	<scope>compile</scope>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <artifactId>maven-changes-plugin</artifactId>
-        <configuration>
-          <xmlPath>${basedir}/xdocs/changes.xml</xmlPath>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Added: turbine/fulcrum/trunk/security/nt/src/site/site.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/nt/src/site/site.xml?rev=1163364&view=auto
==============================================================================
--- turbine/fulcrum/trunk/security/nt/src/site/site.xml (added)
+++ turbine/fulcrum/trunk/security/nt/src/site/site.xml Tue Aug 30 20:09:33 2011
@@ -0,0 +1,28 @@
+<?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.
+-->
+<project
+  name="Fulcrum Security NT Implementation"
+  href="http://turbine.apache.org/fulcrum/fulcrum-security-nt/">
+
+<body>
+
+</body>
+
+</project>

Propchange: turbine/fulcrum/trunk/security/nt/src/site/site.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: turbine/fulcrum/trunk/security/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/pom.xml?rev=1163364&view=auto
==============================================================================
--- turbine/fulcrum/trunk/security/pom.xml (added)
+++ turbine/fulcrum/trunk/security/pom.xml Tue Aug 30 20:09:33 2011
@@ -0,0 +1,78 @@
+<?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.
+-->
+<project
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+   <parent>
+       <artifactId>fulcrum-parent</artifactId>
+       <groupId>org.apache.fulcrum</groupId>
+       <version>1</version>
+   </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.fulcrum</groupId>
+    <artifactId>fulcrum-security-parent</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>Fulcrum Security Master Build</name>
+    <url>http://turbine.apache.org/fucrum/fulcrum-security-site</url>
+    <contributors>
+        <contributor>
+            <name>Ben Gidley</name>
+            <email>ben.gidley@anite.com</email>
+            <organization>Anite</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </contributor>
+        <contributor>
+            <name>Michael Jones</name>
+            <email>michael.jones@anite.com</email>
+            <organization>Anite</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </contributor>
+        <contributor>
+            <name>Kostyantyn Shchekotykhin</name>
+            <email>kostya@ifit.uni-klu.ac.at</email>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </contributor>
+    </contributors>
+    <modules>
+        <module>api</module>
+        <module>hibernate</module>
+        <module>memory</module>
+        <module>nt</module>
+        <!--  module>ldap</module -->
+        <module>torque</module>
+    </modules>
+    <reporting>
+        <plugins>
+            <plugin>
+                <artifactId>maven-changes-plugin</artifactId>
+                <configuration>
+                    <xmlPath>${basedir}/xdocs/changes.xml</xmlPath>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
+</project>

Propchange: turbine/fulcrum/trunk/security/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: turbine/fulcrum/trunk/security/src/site/site.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/src/site/site.xml?rev=1163364&view=auto
==============================================================================
--- turbine/fulcrum/trunk/security/src/site/site.xml (added)
+++ turbine/fulcrum/trunk/security/src/site/site.xml Tue Aug 30 20:09:33 2011
@@ -0,0 +1,45 @@
+<?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.
+-->
+<project
+  name="Fulcrum Security"
+  href="http://turbine.apache.org/fulcrum/fulcrum-security-site/">
+
+<body>
+
+    <menu name="Overview" inherit="top">
+      <item name="Main"                 href="http://turbine.apache.org/fulcrum/fulcrum-security-site/"/>
+      <item name="Authenticators"       href="http://turbine.apache.org/fulcrum/fulcrum-security-site/authenticators.html"/>
+      <item name="Tasks"                href="http://turbine.apache.org/fulcrum/fulcrum-security-site/tasks.html"/>
+    </menu>
+
+    <menu name="Security Components" inherit="top">
+        <item name="Site"                  href="http://turbine.apache.org/fulcrum/fulcrum-security-site/"/>
+        <item name="Security API"          href="http://turbine.apache.org/fulcrum/fulcrum-security-api/"/>
+        <item name="Memory Impl"           href="http://turbine.apache.org/fulcrum/fulcrum-security-memory/"/>
+        <item name="Hibernate Impl"        href="http://turbine.apache.org/fulcrum/fulcrum-security-hibernate/"/>
+        <item name="Torque Impl"           href="http://turbine.apache.org/fulcrum/fulcrum-security-torque/"/>
+        <item name="NT Impl"               href="http://turbine.apache.org/fulcrum/fulcrum-security-nt/"/>
+        <item name="Adapter Turbine"       href="http://turbine.apache.org/fulcrum/fulcrum-security-adapter-turbine/"/>
+        <item name="Adapter OpenSymphony"  href="http://turbine.apache.org/fulcrum/fulcrum-security-adapter-opensymphony/"/>
+    </menu>
+
+</body>
+
+</project>

Propchange: turbine/fulcrum/trunk/security/src/site/site.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: turbine/fulcrum/trunk/security/torque/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/pom.xml?rev=1163364&view=auto
==============================================================================
--- turbine/fulcrum/trunk/security/torque/pom.xml (added)
+++ turbine/fulcrum/trunk/security/torque/pom.xml Tue Aug 30 20:09:33 2011
@@ -0,0 +1,230 @@
+<?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.
+-->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<parent>
+		<artifactId>fulcrum-security-parent</artifactId>
+		<groupId>org.apache.fulcrum</groupId>
+		<version>1.1.0-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.fulcrum</groupId>
+  <artifactId>fulcrum-security-torque</artifactId>
+  <name>Fulcrum Security Torque Impl</name>
+  <version>1.1.0-SNAPSHOT</version>
+  <url>http://turbine.apache.org/fulcrum/fulcrum-security-torque</url>
+  
+  <build>
+    <sourceDirectory>src/java</sourceDirectory>
+    <testSourceDirectory>src/test</testSourceDirectory>
+  
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.4.3</version>
+        <configuration>
+          <forkMode>perTest</forkMode>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.torque</groupId>
+        <artifactId>torque-maven-plugin</artifactId>
+        <version>3.3</version>
+        <configuration>
+          <targetDatabase>mysql</targetDatabase>
+          <schemaDir>schema</schemaDir> 
+        </configuration>
+        <executions>
+          <execution>
+            <id>torque-om</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>om</goal>
+            </goals>
+            <configuration>
+              <targetPackage>org.apache.fulcrum.security.torque.om</targetPackage>
+              <correctGetters>true</correctGetters>
+              <addGetByNameMethod>false</addGetByNameMethod>
+              <addRetrievableInterface>false</addRetrievableInterface>
+              <saveException>TorqueException</saveException>
+              <baseOutputDir>${project.build.directory}/generated-sources/torque</baseOutputDir>
+              <outputDir>${project.build.sourceDirectory}</outputDir> 
+              <reportFile>../../target/torque/report.${project.artifact.artifactId}.om.generation</reportFile>
+              <runOnlyOnSchemaChange>true</runOnlyOnSchemaChange>
+              <enableJava5Features>true</enableJava5Features>
+            </configuration>
+          </execution>
+          <execution>
+            <id>torque-sql-mysql</id>
+            <phase>package</phase>
+            <goals>
+              <goal>sql</goal>
+              <goal>id-table-init-sql</goal>
+            </goals>
+            <configuration>
+                <runOnlyOnSchemaChange>false</runOnlyOnSchemaChange>
+                <outputDir>${project.build.directory}/generated-sql/torque/mysql</outputDir> 
+                <targetDatabase>mysql</targetDatabase>
+            </configuration>
+          </execution>
+          <execution>
+            <id>torque-sql-derby</id>
+            <phase>package</phase>
+            <goals>
+              <goal>sql</goal>
+              <goal>id-table-init-sql</goal>
+            </goals>
+            <configuration>
+                <runOnlyOnSchemaChange>false</runOnlyOnSchemaChange>
+                <outputDir>${project.build.directory}/generated-sql/torque/derby</outputDir> 
+                <targetDatabase>derby</targetDatabase>
+            </configuration>
+          </execution>
+          <execution>
+            <id>torque-sql-oracle</id>
+            <phase>package</phase>
+            <goals>
+              <goal>sql</goal>
+              <goal>id-table-init-sql</goal>
+            </goals>
+            <configuration>
+                <runOnlyOnSchemaChange>false</runOnlyOnSchemaChange>
+                <outputDir>${project.build.directory}/generated-sql/torque/oracle</outputDir> 
+                <targetDatabase>oracle</targetDatabase>
+            </configuration>
+          </execution>
+          <execution>
+            <id>torque-sql-postgresql</id>
+            <phase>package</phase>
+            <goals>
+              <goal>sql</goal>
+              <goal>id-table-init-sql</goal>
+            </goals>
+            <configuration>
+                <runOnlyOnSchemaChange>false</runOnlyOnSchemaChange>
+                <outputDir>${project.build.directory}/generated-sql/torque/postgresql</outputDir> 
+                <targetDatabase>postgresql</targetDatabase>
+            </configuration>
+          </execution>
+          <execution>
+            <id>torque-sql-mssql</id>
+            <phase>package</phase>
+            <goals>
+              <goal>sql</goal>
+              <goal>id-table-init-sql</goal>
+            </goals>
+            <configuration>
+                <runOnlyOnSchemaChange>false</runOnlyOnSchemaChange>
+                <outputDir>${project.build.directory}/generated-sql/torque/mssql</outputDir> 
+                <targetDatabase>mssql</targetDatabase>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  
+  <properties>
+    <maven.compile.source>1.5</maven.compile.source>
+    <maven.compile.target>1.5</maven.compile.target>
+  </properties>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.fulcrum</groupId>
+      <artifactId>fulcrum-security-api</artifactId>
+      <version>1.1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.fulcrum</groupId>
+        <artifactId>fulcrum-security-api</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+        <type>test-jar</type>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+      <artifactId>hsqldb</artifactId>
+      <groupId>hsqldb</groupId>
+      <version>1.8.0.7</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.fulcrum</groupId>
+        <artifactId>fulcrum-testcontainer</artifactId>
+        <version>1.0.6</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.fulcrum</groupId>
+        <artifactId>fulcrum-yaafi</artifactId>
+        <version>1.0.6</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+    	<groupId>org.apache.fulcrum</groupId>
+    	<artifactId>fulcrum-crypto</artifactId>
+    	<version>1.0.7</version>
+    	<type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-configuration</groupId>
+      <artifactId>commons-configuration</artifactId>
+      <version>1.6</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.avalon.logkit</groupId>
+        <artifactId>avalon-logkit</artifactId>
+        <version>2.2.1</version>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.torque</groupId>
+        <artifactId>village</artifactId>
+        <version>3.3.1</version>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+    	<groupId>org.apache.torque</groupId>
+    	<artifactId>torque-runtime</artifactId>
+    	<version>3.3</version>
+    	<type>jar</type>
+    	<exclusions>
+    		<exclusion>
+    			<artifactId>avalon-framework-api</artifactId>
+    			<groupId>avalon-framework</groupId>
+    		</exclusion>
+    		<exclusion>
+    			<artifactId>avalon-logkit</artifactId>
+    			<groupId>avalon-logkit</groupId>
+    		</exclusion>
+    	</exclusions>
+    </dependency>
+  </dependencies>
+</project>

Propchange: turbine/fulcrum/trunk/security/torque/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: turbine/fulcrum/trunk/security/torque/schema/fulcrum-basic-schema.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/schema/fulcrum-basic-schema.xml?rev=1163364&r1=1163363&r2=1163364&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/schema/fulcrum-basic-schema.xml (original)
+++ turbine/fulcrum/trunk/security/torque/schema/fulcrum-basic-schema.xml Tue Aug 30 20:09:33 2011
@@ -28,7 +28,7 @@
 <!-- @version $Id: torque-security-schema.xml,v 1.1 2005/09/26 14:10:04 tvan Exp $ -->
 <!-- ====================================================================     -->
 
-<database name="@DATABASE_DEFAULT@">
+<database name="fulcrum">
 
   <table name="FULCRUM_BASIC_GROUP" javaName="TorqueBasicGroup" idMethod="idbroker"
       baseClass="org.apache.fulcrum.security.torque.basic.TorqueAbstractBasicGroup">

Modified: turbine/fulcrum/trunk/security/torque/schema/fulcrum-dynamic-schema.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/schema/fulcrum-dynamic-schema.xml?rev=1163364&r1=1163363&r2=1163364&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/schema/fulcrum-dynamic-schema.xml (original)
+++ turbine/fulcrum/trunk/security/torque/schema/fulcrum-dynamic-schema.xml Tue Aug 30 20:09:33 2011
@@ -28,7 +28,7 @@
 <!-- @version $Id: torque-security-schema.xml,v 1.1 2005/09/26 14:10:04 tvan Exp $ -->
 <!-- ====================================================================     -->
 
-<database name="@DATABASE_DEFAULT@">
+<database name="fulcrum">
 
   <table name="FULCRUM_DYNAMIC_PERMISSION" javaName="TorqueDynamicPermission" idMethod="idbroker"
       baseClass="org.apache.fulcrum.security.torque.dynamic.TorqueAbstractDynamicPermission">

Modified: turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml?rev=1163364&r1=1163363&r2=1163364&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml (original)
+++ turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml Tue Aug 30 20:09:33 2011
@@ -28,7 +28,7 @@
 <!-- @version $Id: torque-security-schema.xml,v 1.1 2005/09/26 14:10:04 tvan Exp $ -->
 <!-- ====================================================================     -->
 
-<database name="@DATABASE_DEFAULT@">
+<database name="fulcrum">
 
   <table name="FULCRUM_TURBINE_PERMISSION" javaName="TorqueTurbinePermission" idMethod="idbroker"
       baseClass="org.apache.fulcrum.security.torque.turbine.TorqueAbstractTurbinePermission">

Modified: turbine/fulcrum/trunk/security/torque/schema/id-table-schema.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/schema/id-table-schema.xml?rev=1163364&r1=1163363&r2=1163364&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/schema/id-table-schema.xml (original)
+++ turbine/fulcrum/trunk/security/torque/schema/id-table-schema.xml Tue Aug 30 20:09:33 2011
@@ -31,7 +31,7 @@
 <!-- @version $Id: id-table-schema.xml,v 1.2 2005/09/23 12:19:52 tvan Exp $ -->
 <!-- ==================================================================== -->
 
-<database name="@DATABASE_DEFAULT@">
+<database name="fulcrum">
   <table name="ID_TABLE" idMethod="idbroker">
     <column name="ID_TABLE_ID" required="true" primaryKey="true" type="INTEGER"/>
     <column name="TABLE_NAME" required="true" size="255" type="VARCHAR"/>

Added: turbine/fulcrum/trunk/security/torque/src/site/site.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/site/site.xml?rev=1163364&view=auto
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/site/site.xml (added)
+++ turbine/fulcrum/trunk/security/torque/src/site/site.xml Tue Aug 30 20:09:33 2011
@@ -0,0 +1,28 @@
+<?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.
+-->
+<project
+  name="Fulcrum Security Torque Implementation"
+  href="http://turbine.apache.org/fulcrum/fulcrum-security-torque/">
+
+<body>
+
+</body>
+
+</project>

Propchange: turbine/fulcrum/trunk/security/torque/src/site/site.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain