Author: tv
Date: Mon Sep 30 09:12:46 2013
New Revision: 1527492
URL: http://svn.apache.org/r1527492
Log:
- Prepare components and sites for multi-module build
- Update docs
- Derive from Turbine parent POM 3
Added:
turbine/fulcrum/trunk/security/src/site/resources/images/
- copied from r1526815, turbine/fulcrum/trunk/security/xdocs/images/
turbine/fulcrum/trunk/security/src/site/resources/images/basic.png (with
props)
turbine/fulcrum/trunk/security/src/site/resources/images/dynamic.png
(with props)
turbine/fulcrum/trunk/security/src/site/resources/images/turbine.png
(with props)
Removed:
turbine/fulcrum/trunk/security/xdocs/changes.xml
turbine/fulcrum/trunk/security/xdocs/images/
Modified:
turbine/fulcrum/trunk/security/api/pom.xml
turbine/fulcrum/trunk/security/api/src/site/site.xml
turbine/fulcrum/trunk/security/hibernate/pom.xml
turbine/fulcrum/trunk/security/hibernate/src/site/site.xml
turbine/fulcrum/trunk/security/ldap/pom.xml
turbine/fulcrum/trunk/security/ldap/src/site/site.xml
turbine/fulcrum/trunk/security/memory/pom.xml
turbine/fulcrum/trunk/security/memory/src/site/site.xml
turbine/fulcrum/trunk/security/nt/pom.xml
turbine/fulcrum/trunk/security/nt/src/site/site.xml
turbine/fulcrum/trunk/security/pom.xml
turbine/fulcrum/trunk/security/src/changes/changes.xml
turbine/fulcrum/trunk/security/src/site/site.xml
turbine/fulcrum/trunk/security/torque/pom.xml
turbine/fulcrum/trunk/security/torque/src/site/site.xml
turbine/fulcrum/trunk/security/xdocs/index.xml
turbine/fulcrum/trunk/security/xdocs/tasks.xml
Modified: turbine/fulcrum/trunk/security/api/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/pom.xml?rev=1527492&r1=1527491&r2=1527492&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/pom.xml (original)
+++ turbine/fulcrum/trunk/security/api/pom.xml Mon Sep 30 09:12:46 2013
@@ -20,6 +20,7 @@
<artifactId>fulcrum-security-parent</artifactId>
<groupId>org.apache.fulcrum</groupId>
<version>1.1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.fulcrum</groupId>
@@ -28,7 +29,7 @@
<version>1.1.0-SNAPSHOT</version>
<description>Fulcrum Security Basic API</description>
- <url>http://turbine.apache.org/fulcrum/fulcrum-security-api</url>
+ <url>http://turbine.apache.org/fulcrum/security/fulcrum-security-api</url>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/api/</connection>
@@ -36,14 +37,6 @@
<url>http://svn.apache.org/viewcvs/turbine/fulcrum/trunk/security/api/</url>
</scm>
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <name>Fulcrum Website</name>
-
<url>${turbine.deployment.protocol}://people.apache.org/www/turbine.apache.org/fulcrum/fulcrum-security-api/</url>
- </site>
- </distributionManagement>
-
<dependencies>
<dependency>
<groupId>commons-lang</groupId>
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=1527492&r1=1527491&r2=1527492&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/security/api/src/site/site.xml Mon Sep 30 09:12:46
2013
@@ -17,12 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<project
- name="Fulcrum Security API"
- href="http://turbine.apache.org/fulcrum/fulcrum-security-api/";>
+<project xmlns="http://maven.apache.org/DECORATION/1.4.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0
http://maven.apache.org/xsd/decoration-1.4.0.xsd";
+ name="Fulcrum Security API">
<body>
-
</body>
</project>
Modified: turbine/fulcrum/trunk/security/hibernate/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/pom.xml?rev=1527492&r1=1527491&r2=1527492&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/hibernate/pom.xml (original)
+++ turbine/fulcrum/trunk/security/hibernate/pom.xml Mon Sep 30 09:12:46 2013
@@ -24,6 +24,7 @@
<artifactId>fulcrum-security-parent</artifactId>
<groupId>org.apache.fulcrum</groupId>
<version>1.1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.fulcrum</groupId>
@@ -34,21 +35,13 @@
Fulcrum Security Hibernate Impl is an implementation of the Fulcrum
Security API
that uses Hibernate as a database backend.
</description>
- <url>http://turbine.apache.org/fulcrum/fulcrum-security-hibernate/</url>
+
<url>http://turbine.apache.org/fulcrum/security/fulcrum-security-hibernate/</url>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/hibernate/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/hibernate/</developerConnection>
<url>http://svn.apache.org/viewcvs/turbine/fulcrum/trunk/security/hibernate/</url>
</scm>
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <name>Fulcrum Website</name>
-
<url>${turbine.deployment.protocol}://people.apache.org/www/turbine.apache.org/fulcrum/fulcrum-security-hibernate/</url>
- </site>
- </distributionManagement>
-
<build>
<sourceDirectory>${basedir}/src/java/</sourceDirectory>
<testSourceDirectory>${basedir}/src/test/</testSourceDirectory>
Modified: 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=1527492&r1=1527491&r2=1527492&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/hibernate/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/security/hibernate/src/site/site.xml Mon Sep 30
09:12:46 2013
@@ -17,12 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<project
- name="Fulcrum Security Hibernate Implementation"
- href="http://turbine.apache.org/fulcrum/fulcrum-security-hibernate/";>
+<project xmlns="http://maven.apache.org/DECORATION/1.4.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0
http://maven.apache.org/xsd/decoration-1.4.0.xsd";
+ name="Fulcrum Security Hibernate Implementation">
<body>
-
</body>
</project>
Modified: turbine/fulcrum/trunk/security/ldap/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/ldap/pom.xml?rev=1527492&r1=1527491&r2=1527492&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/ldap/pom.xml (original)
+++ turbine/fulcrum/trunk/security/ldap/pom.xml Mon Sep 30 09:12:46 2013
@@ -20,6 +20,7 @@
<artifactId>fulcrum-security-parent</artifactId>
<groupId>org.apache.fulcrum</groupId>
<version>1.1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.fulcrum</groupId>
@@ -27,21 +28,13 @@
<name>Fulcrum Security LDAP Impl</name>
<version>1.1.0-SNAPSHOT</version>
- <url>http://turbine.apache.org/fulcrum/fulcrum-security-ldap</url>
+ <url>http://turbine.apache.org/fulcrum/security/fulcrum-security-ldap</url>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/ldap/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/ldap/</developerConnection>
<url>http://svn.apache.org/viewcvs/turbine/fulcrum/trunk/security/ldap/</url>
</scm>
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <name>Fulcrum Website</name>
-
<url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/fulcrum/fulcrum-security-ldap/</url>
- </site>
- </distributionManagement>
-
<build>
<sourceDirectory>${basedir}/src/java/</sourceDirectory>
<testSourceDirectory>${basedir}/src/test/</testSourceDirectory>
@@ -115,36 +108,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <id>rc</id>
- <distributionManagement>
- <!-- Cannot define in parent ATM, see COMMONSSITE-26 -->
- <site>
- <id>apache.website</id>
- <name>Apache Fulcrum Release Candidate Staging Site</name>
-
<url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/builds/fulcrum/${fulcrum.componentid}/${fulcrum.release.version}/${fulcrum.rc.version}/site</url>
- </site>
- </distributionManagement>
- </profile>
- </profiles>
-
- <properties>
- <!-- This bits are used for the staging directory -->
- <fulcrum.release.version>1.1.0</fulcrum.release.version>
- <fulcrum.rc.version>RC1</fulcrum.rc.version>
- <fulcrum.deployment.protocol>scpexe</fulcrum.deployment.protocol>
- </properties>
-
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-changes-plugin</artifactId>
- <configuration>
- <xmlPath>${basedir}/xdocs/changes.xml</xmlPath>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
</project>
Modified: turbine/fulcrum/trunk/security/ldap/src/site/site.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/ldap/src/site/site.xml?rev=1527492&r1=1527491&r2=1527492&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/ldap/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/security/ldap/src/site/site.xml Mon Sep 30 09:12:46
2013
@@ -17,12 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<project
- name="Fulcrum Security LDAP Implementation"
- href="http://turbine.apache.org/fulcrum/fulcrum-security-ldap/";>
+<project xmlns="http://maven.apache.org/DECORATION/1.4.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0
http://maven.apache.org/xsd/decoration-1.4.0.xsd";
+ name="Fulcrum Security LDAP Implementation">
<body>
-
</body>
</project>
Modified: turbine/fulcrum/trunk/security/memory/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/pom.xml?rev=1527492&r1=1527491&r2=1527492&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/memory/pom.xml (original)
+++ turbine/fulcrum/trunk/security/memory/pom.xml Mon Sep 30 09:12:46 2013
@@ -20,6 +20,7 @@
<artifactId>fulcrum-security-parent</artifactId>
<groupId>org.apache.fulcrum</groupId>
<version>1.1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.fulcrum</groupId>
@@ -30,7 +31,7 @@
Fulcrum Security Memory Impl is an implementation of the Fulcrum
Security API
that uses simple HashMaps as a backend. It is meant mainly for test
purposes.
</description>
- <url>http://turbine.apache.org/fulcrum/fulcrum-security-memory</url>
+
<url>http://turbine.apache.org/fulcrum/security/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>
Modified: 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=1527492&r1=1527491&r2=1527492&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/memory/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/security/memory/src/site/site.xml Mon Sep 30 09:12:46
2013
@@ -17,12 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<project
- name="Fulcrum Security Memory Implementation"
- href="http://turbine.apache.org/fulcrum/fulcrum-security-memory/";>
+<project xmlns="http://maven.apache.org/DECORATION/1.4.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0
http://maven.apache.org/xsd/decoration-1.4.0.xsd";
+ name="Fulcrum Security Memory Implementation">
<body>
-
</body>
</project>
Modified: turbine/fulcrum/trunk/security/nt/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/nt/pom.xml?rev=1527492&r1=1527491&r2=1527492&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/nt/pom.xml (original)
+++ turbine/fulcrum/trunk/security/nt/pom.xml Mon Sep 30 09:12:46 2013
@@ -21,6 +21,7 @@
<artifactId>fulcrum-security-parent</artifactId>
<groupId>org.apache.fulcrum</groupId>
<version>1.1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.fulcrum</groupId>
@@ -29,9 +30,9 @@
<name>Fulcrum Security NT Impl</name>
<description>
Fulcrum Security NT Impl is an implementation of the Fulcrum Security API
- that uses a Microsoft Windows NT Server as a backend.
+ that uses a Microsoft Windows NT Server as a authentication source.
</description>
- <url>http://turbine.apache.org/fulcrum/fulcrum-security-nt</url>
+ <url>http://turbine.apache.org/fulcrum/security/fulcrum-security-nt</url>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/nt/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/nt/</developerConnection>
@@ -74,13 +75,6 @@
<version>1.0.6</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified: 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=1527492&r1=1527491&r2=1527492&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/nt/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/security/nt/src/site/site.xml Mon Sep 30 09:12:46 2013
@@ -17,12 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<project
- name="Fulcrum Security NT Implementation"
- href="http://turbine.apache.org/fulcrum/fulcrum-security-nt/";>
+<project xmlns="http://maven.apache.org/DECORATION/1.4.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0
http://maven.apache.org/xsd/decoration-1.4.0.xsd";
+ name="Fulcrum Security NT Implementation">
<body>
-
</body>
</project>
Modified: turbine/fulcrum/trunk/security/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/pom.xml?rev=1527492&r1=1527491&r2=1527492&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/pom.xml (original)
+++ turbine/fulcrum/trunk/security/pom.xml Mon Sep 30 09:12:46 2013
@@ -23,7 +23,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>2</version>
+ <version>3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.fulcrum</groupId>
@@ -31,16 +31,36 @@
<version>1.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Fulcrum Security Master Build</name>
- <url>http://turbine.apache.org/fulcrum/fulcrum-security-site</url>
+ <url>http://turbine.apache.org/fulcrum/security/</url>
+ <!-- Required for staging to work -->
<distributionManagement>
<site>
- <id>apache.website</id>
- <name>Fulcrum Website</name>
-
<url>${turbine.deployment.protocol}://people.apache.org/www/turbine.apache.org/fulcrum/fulcrum-security-site/</url>
+ <id>turbine.apache.org</id>
+ <url>http://turbine.apache.org/fulcrum/security/</url>
</site>
</distributionManagement>
-
+
+ <developers>
+ <developer>
+ <id>epugh</id>
+ <name>Eric Pugh</name>
+ <email>[email protected]</email>
+ <url />
+ <organization />
+ <timezone />
+ </developer>
+ <developer>
+ <name>Thomas Vandahl</name>
+ <id>tv</id>
+ <email>[email protected]</email>
+ <organization />
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>1</timezone>
+ </developer>
+ </developers>
<contributors>
<contributor>
<name>Ben Gidley</name>
@@ -74,16 +94,11 @@
<!-- 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>
+
+ <build>
+ <sourceDirectory>${basedir}/src/java</sourceDirectory>
+ <testSourceDirectory>${basedir}/src/test</testSourceDirectory>
+ </build>
<profiles>
<profile>
@@ -119,7 +134,7 @@
</profiles>
<properties>
- <maven.compile.source>1.5</maven.compile.source>
- <maven.compile.target>1.5</maven.compile.target>
+ <turbine.site.path>fulcrum/security</turbine.site.path>
+
<turbine.scmPubCheckoutDirectory>${turbine.site.cache}/fulcrum/security</turbine.scmPubCheckoutDirectory>
</properties>
</project>
Modified: turbine/fulcrum/trunk/security/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/src/changes/changes.xml?rev=1527492&r1=1527491&r2=1527492&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/src/changes/changes.xml (original)
+++ turbine/fulcrum/trunk/security/src/changes/changes.xml Mon Sep 30 09:12:46
2013
@@ -44,7 +44,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>
@@ -104,17 +104,17 @@
<action dev="mmanner" type="add">
Change Dynamic* entity objects to use Set. Refactored Hibernate
implementation of Security to
use more efficient deletion when doing oneshot deletes during
revokeAll methods. Added get[Entity]ById()
- method as well. Change grants/revokes to be Synchronizied.
+ method as well. Change grants/revokes to be Synchronized.
</action>
</release>
<release version="1.0-alpha-6" date="in cvs">
<action dev="epugh" type="add">
- Added getAllUsers() to UserManager
+ Added getAllUsers() to UserManager
</action>
</release>
<release version="1.0-alpha-4" date="in cvs">
<action dev="epugh" type="add">
- Added ThreadSafe marker interface to AbstractManager.
+ Added ThreadSafe marker interface to AbstractManager.
</action>
<action dev="epugh" type="add">
Added the "Basic" model and supplied implementations for memory, NT, and
Hibernate.
@@ -126,9 +126,9 @@
AccessControlLists are now pluggable via the ACLFactory implementation
you supply.
</action>
<action dev="epugh" type="update">
- Vastly refactored the builds into multiple projects. The api related
onces are <code>/api</code> and <code>/spi</code>.
- The implementation details are in
<code>/memory</code>,<code>/hibernate</code>, and<code>/nt</code>. And lastly,
there
- are two adapters: <code>/adapters/turbine</code> and
<code>/adapters/opensymphony</code>.
+ Vastly refactored the builds into multiple projects. The api related
onces are /api and /spi.
+ The implementation details are in /memory,/hibernate, and/nt. And lastly,
there
+ are two adapters: /adapters/turbine and /adapters/opensymphony.
</action>
<action dev="epugh" type="remove">
Tossed the various Torque code. It isn't unit tested, and was causing
lots of work that couldn't be tested.. At some
Added: turbine/fulcrum/trunk/security/src/site/resources/images/basic.png
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/src/site/resources/images/basic.png?rev=1527492&view=auto
==============================================================================
Binary file - no diff available.
Propchange: turbine/fulcrum/trunk/security/src/site/resources/images/basic.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: turbine/fulcrum/trunk/security/src/site/resources/images/dynamic.png
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/src/site/resources/images/dynamic.png?rev=1527492&view=auto
==============================================================================
Binary file - no diff available.
Propchange: turbine/fulcrum/trunk/security/src/site/resources/images/dynamic.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: turbine/fulcrum/trunk/security/src/site/resources/images/turbine.png
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/src/site/resources/images/turbine.png?rev=1527492&view=auto
==============================================================================
Binary file - no diff available.
Propchange: turbine/fulcrum/trunk/security/src/site/resources/images/turbine.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: turbine/fulcrum/trunk/security/src/site/site.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/src/site/site.xml?rev=1527492&r1=1527491&r2=1527492&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/security/src/site/site.xml Mon Sep 30 09:12:46 2013
@@ -17,29 +17,23 @@
specific language governing permissions and limitations
under the License.
-->
-<project
- name="Fulcrum Security"
- href="http://turbine.apache.org/fulcrum/fulcrum-security-site/";>
+<project xmlns="http://maven.apache.org/DECORATION/1.4.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0
http://maven.apache.org/xsd/decoration-1.4.0.xsd";
+ name="Fulcrum Security">
<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"/>
+ <item name="Main" href="index.html" collapse="false"/>
</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>
+ <menu ref="modules" />
+ <menu name="Documentation">
+ <item name="Authenticators" href="authenticators.html"/>
+ <item name="Example" href="example.html"/>
+ <item name="Tasks" href="tasks.html"/>
+ </menu>
</body>
</project>
Modified: turbine/fulcrum/trunk/security/torque/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/pom.xml?rev=1527492&r1=1527491&r2=1527492&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/pom.xml (original)
+++ turbine/fulcrum/trunk/security/torque/pom.xml Mon Sep 30 09:12:46 2013
@@ -21,6 +21,7 @@
<artifactId>fulcrum-security-parent</artifactId>
<groupId>org.apache.fulcrum</groupId>
<version>1.1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.fulcrum</groupId>
@@ -31,7 +32,7 @@
Fulcrum Security Torque Impl is an implementation of the Fulcrum Security
API
that uses Apache DB Torque as a database backend.
</description>
- <url>http://turbine.apache.org/fulcrum/fulcrum-security-torque</url>
+ <url>http://turbine.apache.org/fulcrum/security/fulcrum-security-torque</url>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/torque/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/torque/</developerConnection>
@@ -46,7 +47,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
<configuration>
<forkMode>perTest</forkMode>
</configuration>
@@ -61,6 +61,11 @@
<version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.apache.torque</groupId>
+ <artifactId>torque-runtime</artifactId>
+ <version>4.0</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-security-api</artifactId>
<version>1.1.0-SNAPSHOT</version>
@@ -71,7 +76,6 @@
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.8.0.7</version>
- <type>jar</type>
<scope>test</scope>
</dependency>
<dependency>
@@ -92,18 +96,6 @@
<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>org.apache.torque</groupId>
- <artifactId>torque-runtime</artifactId>
- <version>4.0</version>
- <type>jar</type>
- </dependency>
</dependencies>
<profiles>
Modified: 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=1527492&r1=1527491&r2=1527492&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/security/torque/src/site/site.xml Mon Sep 30 09:12:46
2013
@@ -17,12 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<project
- name="Fulcrum Security Torque Implementation"
- href="http://turbine.apache.org/fulcrum/fulcrum-security-torque/";>
+<project xmlns="http://maven.apache.org/DECORATION/1.4.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0
http://maven.apache.org/xsd/decoration-1.4.0.xsd";
+ name="Fulcrum Security Torque Implementation">
<body>
-
</body>
</project>
Modified: turbine/fulcrum/trunk/security/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/xdocs/index.xml?rev=1527492&r1=1527491&r2=1527492&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/xdocs/index.xml (original)
+++ turbine/fulcrum/trunk/security/xdocs/index.xml Mon Sep 30 09:12:46 2013
@@ -22,7 +22,7 @@
<properties>
<title>Security Component</title>
- <author email="[email protected]">Eric PUgh</author>
+ <author email="[email protected]">Eric Pugh</author>
</properties>
<body>
@@ -67,32 +67,46 @@
In it, you have a set of permissions that are related in a many to many
relation ship with a set or roles.
Those roles are related
in a many to many relationship with a set of groups. A user is in a
many to many relationship
- with a set of groups. <i>note: I will try and get a diagram. any
suggestions on diagram tools?</i>
+ with a set of groups.
</p>
<p>
- The <code>memory</code>, <code>hibernate</code> and <code>torque</code>
packages currently implements this security model.
+ The <code>memory</code>, <code>hibernate</code> and <code>torque</code>
packages currently implement this security model.
</p>
</subsection>
<subsection name="Turbine">
<p>
- This model is based on what the Turbine application server uses, and
leverages the Dynamic model. It merely adds
- the concept of a "global group" which is a toplevel group to the Dynamic
model.
- However, what makes this different is that instead of roles
- being related just to groups, there instead is a many to many relationship
between users and
- groups and roles. So you pick a user, pick their role, and their group,
and that is their permissions.
- </p>
+ This model is based on what the Turbine application server uses, and
leverages the Dynamic model. It merely adds
+ the concept of a "global group" which is a toplevel group to the Dynamic
model.
+ However, what makes this different is that instead of roles
+ being related just to groups, there instead is a many to many
relationship between users and
+ groups and roles. So you pick a user, pick their role, and their group,
and that is their permissions.
+ </p>
+ <p>
+ The <code>memory</code>, <code>hibernate</code> and <code>torque</code>
packages currently implement this security model.
+ </p>
</subsection>
+
<subsection name="Basic">
<p>
- This model is very simple and was originally inspired by OSUser's security
model. In it, you have users, and groups, and security
- is based on a user belonging to a group. Users can belong to multiple
groups. So groups become
- the equivalent of roles/permissions.
+ This model is very simple and was originally inspired by OSUser's
security model. In it, you have users, and groups, and security
+ is based on a user belonging to a group. Users can belong to multiple
groups. So groups become
+ the equivalent of roles/permissions.
</p>
<p>
- The <code>memory</code>, <code>nt</code> <code>torque</code> and
<code>hibernate</code> packages currently implements this security model.
+ The <code>memory</code>, <code>nt</code> <code>torque</code> and
<code>hibernate</code> packages currently implement this security model.
</p>
</subsection>
+
+ <subsection name="Diagrams">
+ <table>
+ <tr style="background-color: white;">
+ <td><img src="images/dynamic.png" /></td>
+ <td><img src="images/turbine.png" /></td>
+ <td><img src="images/basic.png" /></td>
+ </tr>
+ </table>
+ </subsection>
</section>
<section name="Simple">
Modified: turbine/fulcrum/trunk/security/xdocs/tasks.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/xdocs/tasks.xml?rev=1527492&r1=1527491&r2=1527492&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/xdocs/tasks.xml (original)
+++ turbine/fulcrum/trunk/security/xdocs/tasks.xml Mon Sep 30 09:12:46 2013
@@ -32,35 +32,22 @@
<p>
<ul>
- <li>
- Need to use the encryption component!
- </li>
- <li>
- Finish fleshing out the Adapters for Turbine. Right now they
are a pretty minimal implementation
- to validate that the Adapter concept would work. Currently they
only support moving objects from
- fulcrum to turbine. Sending objects from Turbine back to
Fulcrum is not supported. Just needs some
- grunt work.
- </li>
<li>
Try and figure out how to get both NTLM authentication, as well
as retrieving the password, or the groups
directly to use with "Basic" security model.
</li>
- <li>
- Upgrade to using Merlin for unit tests instead of ECM.. Also
have demos showing using the security module
- in Merlin.
- </li>
</ul>
</p>
</section>
- <section name="Things to Resolve">
+ <!-- section name="Things to Resolve">
- </section>
+ </section -->
</body>
</document>
