You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by dj...@apache.org on 2007/01/06 18:06:51 UTC
svn commit: r493508 - in /directory/sandbox/triplesec-jacc2: ./ admin-api/
admin-api/src/test/resources/ guardian-ldap/
guardian-ldap/src/test/resources/ integration/
integration/src/main/java/org/safehaus/triplesec/integration/
integration/src/test/re...
Author: djencks
Date: Sat Jan 6 09:06:49 2007
New Revision: 493508
URL: http://svn.apache.org/viewvc?view=rev&rev=493508
Log:
Get resources for all integration tests from a project module jar, eliminating duplicates. This can probably be merged to trunk as-is
Added:
directory/sandbox/triplesec-jacc2/itest-data/
- copied from r493297, directory/sandbox/triplesec-jacc/itest-data/
directory/sandbox/triplesec-jacc2/jacc/
- copied from r493297, directory/sandbox/triplesec-jacc/jacc/
Removed:
directory/sandbox/triplesec-jacc2/admin-api/src/test/resources/
directory/sandbox/triplesec-jacc2/guardian-ldap/src/test/resources/
directory/sandbox/triplesec-jacc2/integration/src/test/resources/
directory/sandbox/triplesec-jacc2/swing-admin/src/test/resources/
directory/sandbox/triplesec-jacc2/swing-demo/src/test/resources/
directory/sandbox/triplesec-jacc2/webapp-changelog/src/main/webapp/WEB-INF/classes/
directory/sandbox/triplesec-jacc2/webapp-changelog/src/test/resources/
directory/sandbox/triplesec-jacc2/webapp-config/src/test/resources/
directory/sandbox/triplesec-jacc2/webapp-demo/src/test/resources/
directory/sandbox/triplesec-jacc2/webapp-registration/src/test/resources/
directory/sandbox/triplesec-jacc2/webapp-servlet-demo/src/test/resources/
directory/sandbox/triplesec-jacc2/webapp-wicket-admin/src/test/resources/
Modified:
directory/sandbox/triplesec-jacc2/admin-api/pom.xml
directory/sandbox/triplesec-jacc2/guardian-ldap/pom.xml
directory/sandbox/triplesec-jacc2/integration/pom.xml
directory/sandbox/triplesec-jacc2/integration/src/main/java/org/safehaus/triplesec/integration/TriplesecIntegration.java
directory/sandbox/triplesec-jacc2/itest-data/src/main/resources/server.ldif
directory/sandbox/triplesec-jacc2/itest-data/src/main/resources/server.xml
directory/sandbox/triplesec-jacc2/jacc/src/main/java/org/apache/directory/triplesec/jacc/DataPolicyConfiguration.java
directory/sandbox/triplesec-jacc2/jacc/src/main/java/org/apache/directory/triplesec/jacc/data/Context.java
directory/sandbox/triplesec-jacc2/jacc/src/test/java/org/apache/directory/triplesec/jacc/TripleSecPolicyIntegrationTest.java
directory/sandbox/triplesec-jacc2/pom.xml
directory/sandbox/triplesec-jacc2/swing-admin/pom.xml
directory/sandbox/triplesec-jacc2/swing-demo/pom.xml
directory/sandbox/triplesec-jacc2/tools/src/main/java/org/safehaus/triplesec/tools/Tools.java
directory/sandbox/triplesec-jacc2/webapp-changelog/pom.xml
directory/sandbox/triplesec-jacc2/webapp-config/pom.xml
directory/sandbox/triplesec-jacc2/webapp-demo/pom.xml
directory/sandbox/triplesec-jacc2/webapp-registration/pom.xml
directory/sandbox/triplesec-jacc2/webapp-servlet-demo/pom.xml
directory/sandbox/triplesec-jacc2/webapp-wicket-admin/pom.xml
Modified: directory/sandbox/triplesec-jacc2/admin-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc2/admin-api/pom.xml?view=diff&rev=493508&r1=493507&r2=493508
==============================================================================
--- directory/sandbox/triplesec-jacc2/admin-api/pom.xml (original)
+++ directory/sandbox/triplesec-jacc2/admin-api/pom.xml Sat Jan 6 09:06:49 2007
@@ -39,12 +39,28 @@
<artifactId>triplesec-guardian-api</artifactId>
<version>${pom.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>nlog4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>triplesec-integration</artifactId>
<version>${pom.version}</version>
+ <scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>triplesec-itest-data</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -119,6 +135,41 @@
<activation>
<property><name>integration</name></property>
</activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-itest-data</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>triplesec-itest-data</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/serverHome/conf</outputDirectory>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
Modified: directory/sandbox/triplesec-jacc2/guardian-ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc2/guardian-ldap/pom.xml?view=diff&rev=493508&r1=493507&r2=493508
==============================================================================
--- directory/sandbox/triplesec-jacc2/guardian-ldap/pom.xml (original)
+++ directory/sandbox/triplesec-jacc2/guardian-ldap/pom.xml Sat Jan 6 09:06:49 2007
@@ -49,6 +49,12 @@
<version>${pom.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>triplesec-itest-data</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -122,6 +128,35 @@
<activation>
<property><name>integration</name></property>
</activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-itest-data</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>triplesec-itest-data</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/serverHome/conf</outputDirectory>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
</profile>
</profiles>
Modified: directory/sandbox/triplesec-jacc2/integration/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc2/integration/pom.xml?view=diff&rev=493508&r1=493507&r2=493508
==============================================================================
--- directory/sandbox/triplesec-jacc2/integration/pom.xml (original)
+++ directory/sandbox/triplesec-jacc2/integration/pom.xml Sat Jan 6 09:06:49 2007
@@ -47,6 +47,12 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>triplesec-itest-data</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
@@ -100,6 +106,30 @@
</activation>
<build>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-itest-data</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>triplesec-itest-data</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/serverHome/conf</outputDirectory>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
Modified: directory/sandbox/triplesec-jacc2/integration/src/main/java/org/safehaus/triplesec/integration/TriplesecIntegration.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc2/integration/src/main/java/org/safehaus/triplesec/integration/TriplesecIntegration.java?view=diff&rev=493508&r1=493507&r2=493508
==============================================================================
--- directory/sandbox/triplesec-jacc2/integration/src/main/java/org/safehaus/triplesec/integration/TriplesecIntegration.java (original)
+++ directory/sandbox/triplesec-jacc2/integration/src/main/java/org/safehaus/triplesec/integration/TriplesecIntegration.java Sat Jan 6 09:06:49 2007
@@ -25,6 +25,7 @@
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
+import java.net.URL;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -99,7 +100,6 @@
* Creates a unit test case that sets up and runs the Triplesec server
* for each unit test with a fresh database.
*
- * @param resourcesDirectory the directory containing triplesec resource files
* @throws Exception if there are configuration issues with the unit test
*/
public TriplesecIntegration() throws Exception
@@ -112,7 +112,6 @@
* Creates a unit test case that sets up and runs the Triplesec server
* for each unit test with a fresh database.
*
- * @param resourcesDirectory the directory containing triplesec resource files
* @param string the name of the unit test
* @throws Exception if there are configuration issues with the unit test
*/
@@ -276,30 +275,28 @@
*/
private void init() throws Exception
{
- this.resourcesDirectory = new File ( System.getProperties().getProperty(
+ resourcesDirectory = new File ( System.getProperties().getProperty(
RESOURCES_DIRECTORY, "src/test/resources" ) );
if ( ! resourcesDirectory.exists() )
{
String msg = "The configuration resources directory '" +
resourcesDirectory + "' does not exist will search classpath for resources";
- fail( msg );
+ resourcesDirectory = null;
+ log.error( msg );
}
// --------------------------------------------------------------------
// Setup the serverHome directory
// --------------------------------------------------------------------
- File targetDirectory = new File( "target" );
- if ( ! targetDirectory.exists() )
- {
- targetDirectory.mkdirs();
- }
-
- serverHome = new File( targetDirectory, "serverHome" );
- if ( serverHome.exists() )
- {
- FileUtils.deleteDirectory( serverHome );
+ String basedir = System.getProperties().getProperty(
+ "basedir");
+ File targetDirectory;
+ if (basedir == null) {
+ serverHome = new File("target/serverHome");
+ } else {
+ serverHome = new File( new File (basedir ), "target/serverHome" );
}
// --------------------------------------------------------------------
@@ -314,18 +311,23 @@
File webappsDir = new File( serverHome, "webapps" );
webappsDir.mkdir();
initWebapps( webappsDir );
-
- FileUtils.copyFileToDirectory( new File( resourcesDirectory, "server.xml" ), confDir );
- File [] ldifFiles = resourcesDirectory.listFiles( new FileFilter()
- {
- public boolean accept( File file )
+
+ if (resourcesDirectory != null) {
+ File serverConfig = new File(resourcesDirectory, "server.xml");
+ if (serverConfig.exists()) {
+ FileUtils.copyFileToDirectory( serverConfig, confDir );
+ }
+ File [] ldifFiles = resourcesDirectory.listFiles( new FileFilter()
{
- return file.getName().endsWith( "ldif" );
+ public boolean accept( File file )
+ {
+ return file.getName().endsWith( "ldif" );
+ }
+ });
+ for ( int ii = 0; ii < ldifFiles.length; ii++ )
+ {
+ FileUtils.copyFileToDirectory( ldifFiles[ii], confDir );
}
- });
- for ( int ii = 0; ii < ldifFiles.length; ii++ )
- {
- FileUtils.copyFileToDirectory( ldifFiles[ii], confDir );
}
}
Modified: directory/sandbox/triplesec-jacc2/itest-data/src/main/resources/server.ldif
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc2/itest-data/src/main/resources/server.ldif?view=diff&rev=493508&r1=493297&r2=493508
==============================================================================
--- directory/sandbox/triplesec-jacc2/itest-data/src/main/resources/server.ldif (original)
+++ directory/sandbox/triplesec-jacc2/itest-data/src/main/resources/server.ldif Sat Jan 6 09:06:49 2007
@@ -6,23 +6,22 @@
# 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.
-#
-#
+# under the License.
#
# EXAMPLE.COM is freely and reserved for testing according to this RFC:
#
# http://www.rfc-editor.org/rfc/rfc2606.txt
#
#
+
#
# This ACI allows brouse access to the root suffix and one level below that to anyone.
# At this level there is nothing critical exposed. Everything that matters is one or
@@ -103,7 +102,7 @@
# The only thing these users cannot do is modify the system partition. They are only
# restricted to superUser rights within this realm partition
#
-
+
dn: cn=superUsersAci,dc=example,dc=com
objectClass: top
objectClass: subentry
@@ -115,7 +114,7 @@
# This ACI allows members of the userAdmin group to have full modify and read access
# to user accounts besides their own. Hence they can administer users in the system.
#
-
+
dn: cn=userAdminsAci,dc=example,dc=com
objectClass: top
objectClass: subentry
@@ -126,10 +125,10 @@
#
# This ACI allows members of the applicationAdmin group to have full modify and read access
-# to all applications in the realm. Adding users to this group is like a wild card for
+# to all applications in the realm. Adding users to this group is like a wild card for
# application access.
#
-
+
dn: cn=applicationAdminsAci,dc=example,dc=com
objectClass: top
objectClass: subentry
@@ -140,20 +139,20 @@
#
# This ACI allows members of the groupAdmins group to have full modify and read access
-# to all groups in the realm other than the superUsers, userAdmins, groupAdmins, and the
+# to all groups in the realm other than the superUsers, userAdmins, groupAdmins, and the
# applicationAdmins groups.
#
# The rational behind this is to prevent these users from changing their or other
-# users' access rights for the entire system by modifying their membership in these
+# users' access rights for the entire system by modifying their membership in these
# groups. Making someone a groupAdmin should not open the door to their ability to
# grant themselves or others system wide administrative abilities.
#
-# Really the groupAdmins group is intended for users that have the ability to manage
-# group membership in specific application administration groups and that's all.
+# Really the groupAdmins group is intended for users that have the ability to manage
+# group membership in specific application administration groups and that's all.
# These types of admins should not have the right to promote others to system level
# administrators or complete super users.
#
-
+
dn: cn=groupAdminsAci,dc=example,dc=com
objectClass: top
objectClass: subentry
@@ -197,7 +196,7 @@
safehausNotifyBy: sms
userpassword: maxwell
-dn: uid=lockedout, ou=Users, dc=example, dc=com
+dn: uid=lockedout, ou=Users, dc=example,dc=com
cn: Risky
sn: Lockedout
givenname: Unlucky
@@ -231,7 +230,7 @@
safehausNotifyBy: sms
userpassword: asdfasdf
-dn: uid=erodriguez, ou=Users, dc=example, dc=com
+dn: uid=erodriguez, ou=Users, dc=example,dc=com
cn: Enrique Rodriguez
sn: Rodriguez
givenname: Enrique
@@ -265,7 +264,7 @@
safehausNotifyBy: sms
userpassword: noices
-dn: uid=krbtgt, ou=Users, dc=example, dc=com
+dn: uid=krbtgt, ou=Users, dc=example,dc=com
cn: Kerberos Server
sn: Server
givenname: Kerberos
@@ -288,7 +287,7 @@
roomnumber: 667
userpassword: kahuna
-dn: uid=hostssh, ou=Users, dc=example, dc=com
+dn: uid=hostssh, ou=Users, dc=example,dc=com
cn: SSH Service
sn: Service
givenname: SSH
@@ -311,7 +310,7 @@
roomnumber: 667
userpassword: randall
-dn: uid=hostssh2, ou=Users, dc=example, dc=com
+dn: uid=hostssh2, ou=Users, dc=example,dc=com
cn: SSH Service
sn: Service
givenname: SSH
@@ -333,212 +332,154 @@
roomnumber: 667
userpassword: randall
-dn: ou=applications,dc=example, dc=com
+dn: ou=applications,dc=example,dc=com
objectClass: top
objectClass: organizationalunit
ou: applications
-dn: appName=mockApplication,ou=applications,dc=example, dc=com
+dn: appName=mockApplication,ou=applications,dc=example,dc=com
objectClass: top
objectClass: policyApplication
appName: mockApplication
userPassword:: dGVzdGluZw==
-dn: ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: ou=permissions,appName=mockApplication,ou=applications,dc=example,dc=com
objectClass: top
objectClass: organizationalUnit
-ou: roles
+ou: permissions
-dn: roleName=org.apache.directory.triplesec.jacc.unchecked,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
-objectClass: policyRole
+dn: permName=mockPerm0,ou=permissions,appName=mockApplication,ou=applications,dc=example,dc=com
objectClass: top
-roleName: org.apache.directory.triplesec.jacc.unchecked
+objectClass: policyPermission
+permName: mockPerm0
-dn: roleName=org.apache.directory.triplesec.jacc.excluded,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
-objectClass: policyRole
+dn: permName=mockPerm1,ou=permissions,appName=mockApplication,ou=applications,dc=example,dc=com
objectClass: top
-roleName: org.apache.directory.triplesec.jacc.excluded
+objectClass: policyPermission
+permName: mockPerm1
-dn: roleName=mockRole0,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
-objectClass: policyRole
+dn: permName=mockPerm2,ou=permissions,appName=mockApplication,ou=applications,dc=example,dc=com
objectClass: top
-roleName: mockRole0
+objectClass: policyPermission
+permName: mockPerm2
-dn: roleName=mockRole1,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: permName=mockPerm3,ou=permissions,appName=mockApplication,ou=applications,dc=example,dc=com
objectClass: top
-objectClass: policyRole
-roleName: mockRole1
+objectClass: policyPermission
+permName: mockPerm3
-dn: permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole1,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: permName=mockPerm4,ou=permissions,appName=mockApplication,ou=applications,dc=example,dc=com
objectClass: top
-objectClass: permClass
-permClassName: org.safehaus.triplesec.guardian.StringPermission
+objectClass: policyPermission
+permName: mockPerm4
-dn: grant=mockPerm0, permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole1,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: permName=mockPerm5,ou=permissions,appName=mockApplication,ou=applications,dc=example,dc=com
objectClass: top
-objectClass: permGrant
-grant: mockPerm0
+objectClass: policyPermission
+permName: mockPerm5
-dn: roleName=mockRole2,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: permName=mockPerm6,ou=permissions,appName=mockApplication,ou=applications,dc=example,dc=com
objectClass: top
-objectClass: policyRole
-roleName: mockRole2
+objectClass: policyPermission
+permName: mockPerm6
-dn: permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole2,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: permName=mockPerm7,ou=permissions,appName=mockApplication,ou=applications,dc=example,dc=com
objectClass: top
-objectClass: permClass
-permClassName: org.safehaus.triplesec.guardian.StringPermission
+objectClass: policyPermission
+permName: mockPerm7
-dn: grant=mockPerm1, permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole2,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: permName=mockPerm8,ou=permissions,appName=mockApplication,ou=applications,dc=example,dc=com
objectClass: top
-objectClass: permGrant
-grant: mockPerm1
+objectClass: policyPermission
+permName: mockPerm8
-dn: roleName=mockRole3,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: permName=mockPerm9,ou=permissions,appName=mockApplication,ou=applications,dc=example,dc=com
objectClass: top
-objectClass: policyRole
-#grants: mockPerm3
-#grants: mockPerm2
-roleName: mockRole3
-
-dn: permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole3,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
-objectClass: top
-objectClass: permClass
-permClassName: org.safehaus.triplesec.guardian.StringPermission
-
-dn: grant=mockPerm3, permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole3,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
-objectClass: top
-objectClass: permGrant
-grant: mockPerm3
+objectClass: policyPermission
+permName: mockPerm9
-dn: grant=mockPerm2, permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole3,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: ou=roles,appName=mockApplication,ou=applications,dc=example,dc=com
objectClass: top
-objectClass: permGrant
-grant: mockPerm2
+objectClass: organizationalUnit
+ou: roles
-dn: roleName=mockRole4,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
-objectClass: top
+dn: roleName=mockRole0,ou=roles,appName=mockApplication,ou=applications,dc=example,dc=com
objectClass: policyRole
-#grants: mockPerm9
-#grants: mockPerm7
-#grants: mockPerm6
-#grants: mockPerm5
-#grants: mockPerm4
-roleName: mockRole4
-
-dn: permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole4,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
-objectClass: top
-objectClass: permClass
-permClassName: org.safehaus.triplesec.guardian.StringPermission
-
-dn: grant=mockPerm9, permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole4,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
objectClass: top
-objectClass: permGrant
-grant: mockPerm9
+roleName: mockRole0
-dn: grant=mockPerm7, permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole4,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: roleName=mockRole1,ou=roles,appName=mockApplication,ou=applications,dc=example,dc=com
objectClass: top
-objectClass: permGrant
-grant: mockPerm7
+objectClass: policyRole
+grants: mockPerm0
+roleName: mockRole1
-dn: grant=mockPerm6, permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole4,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: roleName=mockRole2,ou=roles,appName=mockApplication,ou=applications,dc=example,dc=com
objectClass: top
-objectClass: permGrant
-grant: mockPerm6
+objectClass: policyRole
+grants: mockPerm1
+roleName: mockRole2
-dn: grant=mockPerm5, permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole4,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: roleName=mockRole3,ou=roles,appName=mockApplication,ou=applications,dc=example,dc=com
objectClass: top
-objectClass: permGrant
-grant: mockPerm5
+objectClass: policyRole
+grants: mockPerm3
+grants: mockPerm2
+roleName: mockRole3
-dn: grant=mockPerm4, permClassName=org.safehaus.triplesec.guardian.StringPermission, roleName=mockRole4,ou=roles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: roleName=mockRole4,ou=roles,appName=mockApplication,ou=applications,dc=example,dc=com
objectClass: top
-objectClass: permGrant
-grant: mockPerm4
+objectClass: policyRole
+grants: mockPerm9
+grants: mockPerm7
+grants: mockPerm6
+grants: mockPerm5
+grants: mockPerm4
+roleName: mockRole4
-dn: ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: ou=profiles,appName=mockApplication,ou=applications,dc=example,dc=com
objectClass: top
objectClass: organizationalUnit
ou: profiles
-dn: profileId=mockProfile0,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: profileId=mockProfile0,ou=profiles,appName=mockApplication,ou=applications,dc=example,dc=com
objectClass: top
objectClass: policyProfile
-profileId: mockProfile0
user: akarasulu
+profileId: mockProfile0
-dn: profileId=mockProfile1,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: profileId=mockProfile1,ou=profiles,appName=mockApplication,ou=applications,dc=example,dc=com
objectClass: top
objectClass: policyProfile
-user: akarasulu
-profileId: mockProfile1
roles: mockRole2
roles: mockRole1
+user: akarasulu
+profileId: mockProfile1
-dn: profileId=mockProfile2,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: profileId=mockProfile2,ou=profiles,appName=mockApplication,ou=applications,dc=example,dc=com
objectClass: top
objectClass: policyProfile
-profileId: mockProfile2
-#grants: mockPerm0
-user: akarasulu
+grants: mockPerm0
roles: mockRole2
+user: akarasulu
+profileId: mockProfile2
-dn: permClassName=org.safehaus.triplesec.guardian.StringPermission, profileId=mockProfile2,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
-objectClass: top
-objectClass: permClass
-permClassName: org.safehaus.triplesec.guardian.StringPermission
-
-dn: grant=mockPerm0, permClassName=org.safehaus.triplesec.guardian.StringPermission, profileId=mockProfile2,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
-objectClass: top
-objectClass: permGrant
-grant: mockPerm0
-
-dn: profileId=mockProfile3,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: profileId=mockProfile3,ou=profiles,appName=mockApplication,ou=applications,dc=example,dc=com
objectClass: top
objectClass: policyProfile
-#grants: mockPerm7
-#grants: mockPerm0
-profileId: mockProfile3
-user: akarasulu
+grants: mockPerm7
+grants: mockPerm0
roles: mockRole3
+user: akarasulu
+profileId: mockProfile3
-dn: permClassName=org.safehaus.triplesec.guardian.StringPermission, profileId=mockProfile3,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
-objectClass: top
-objectClass: permClass
-permClassName: org.safehaus.triplesec.guardian.StringPermission
-
-dn: grant=mockPerm7, permClassName=org.safehaus.triplesec.guardian.StringPermission, profileId=mockProfile3,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
-objectClass: top
-objectClass: permGrant
-grant: mockPerm7
-
-dn: grant=mockPerm0, permClassName=org.safehaus.triplesec.guardian.StringPermission, profileId=mockProfile3,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
-objectClass: top
-objectClass: permGrant
-grant: mockPerm0
-
-dn: profileId=mockProfile4,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
+dn: profileId=mockProfile4,ou=profiles,appName=mockApplication,ou=applications,dc=example,dc=com
objectClass: top
objectClass: policyProfile
-#denials: mockPerm7
-#grants: mockPerm0
+denials: mockPerm7
+grants: mockPerm0
roles: mockRole4
roles: mockRole3
user: akarasulu
profileId: mockProfile4
-
-dn: permClassName=org.safehaus.triplesec.guardian.StringPermission, profileId=mockProfile4,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
-objectClass: top
-objectClass: permClass
-permClassName: org.safehaus.triplesec.guardian.StringPermission
-
-dn: deny=mockPerm7, permClassName=org.safehaus.triplesec.guardian.StringPermission, profileId=mockProfile4,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
-objectClass: top
-objectClass: permDeny
-deny: mockPerm7
-
-dn: grant=mockPerm0, permClassName=org.safehaus.triplesec.guardian.StringPermission, profileId=mockProfile4,ou=profiles,appName=mockApplication,ou=applications,dc=example, dc=com
-objectClass: top
-objectClass: permGrant
-grant: mockPerm0
Modified: directory/sandbox/triplesec-jacc2/itest-data/src/main/resources/server.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc2/itest-data/src/main/resources/server.xml?view=diff&rev=493508&r1=493297&r2=493508
==============================================================================
--- directory/sandbox/triplesec-jacc2/itest-data/src/main/resources/server.xml (original)
+++ directory/sandbox/triplesec-jacc2/itest-data/src/main/resources/server.xml Sat Jan 6 09:06:49 2007
@@ -221,8 +221,8 @@
<value>uid</value>
<value>profileId</value>
<value>roles</value>
- <!--<value>grants</value>-->
- <!--<value>denials</value>-->
+ <value>grants</value>
+ <value>denials</value>
<value>krb5PrincipalName</value>
</set>
</property>
Modified: directory/sandbox/triplesec-jacc2/jacc/src/main/java/org/apache/directory/triplesec/jacc/DataPolicyConfiguration.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc2/jacc/src/main/java/org/apache/directory/triplesec/jacc/DataPolicyConfiguration.java?view=diff&rev=493508&r1=493297&r2=493508
==============================================================================
--- directory/sandbox/triplesec-jacc2/jacc/src/main/java/org/apache/directory/triplesec/jacc/DataPolicyConfiguration.java (original)
+++ directory/sandbox/triplesec-jacc2/jacc/src/main/java/org/apache/directory/triplesec/jacc/DataPolicyConfiguration.java Sat Jan 6 09:06:49 2007
@@ -34,7 +34,7 @@
import org.safehaus.triplesec.admin.dao.DaoFactory;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class DataPolicyConfiguration implements PolicyConfiguration {
Modified: directory/sandbox/triplesec-jacc2/jacc/src/main/java/org/apache/directory/triplesec/jacc/data/Context.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc2/jacc/src/main/java/org/apache/directory/triplesec/jacc/data/Context.java?view=diff&rev=493508&r1=493297&r2=493508
==============================================================================
--- directory/sandbox/triplesec-jacc2/jacc/src/main/java/org/apache/directory/triplesec/jacc/data/Context.java (original)
+++ directory/sandbox/triplesec-jacc2/jacc/src/main/java/org/apache/directory/triplesec/jacc/data/Context.java Sat Jan 6 09:06:49 2007
@@ -29,7 +29,7 @@
import org.safehaus.triplesec.admin.dao.DaoFactory;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class Context {
Modified: directory/sandbox/triplesec-jacc2/jacc/src/test/java/org/apache/directory/triplesec/jacc/TripleSecPolicyIntegrationTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc2/jacc/src/test/java/org/apache/directory/triplesec/jacc/TripleSecPolicyIntegrationTest.java?view=diff&rev=493508&r1=493297&r2=493508
==============================================================================
--- directory/sandbox/triplesec-jacc2/jacc/src/test/java/org/apache/directory/triplesec/jacc/TripleSecPolicyIntegrationTest.java (original)
+++ directory/sandbox/triplesec-jacc2/jacc/src/test/java/org/apache/directory/triplesec/jacc/TripleSecPolicyIntegrationTest.java Sat Jan 6 09:06:49 2007
@@ -57,7 +57,7 @@
import org.safehaus.triplesec.admin.dao.ldap.LdapDaoFactory;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class TripleSecPolicyIntegrationTest extends TriplesecIntegration {
public final static String POLICY_CONFIG_FACTORY = "javax.security.jacc.PolicyConfigurationFactory.provider";
Modified: directory/sandbox/triplesec-jacc2/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc2/pom.xml?view=diff&rev=493508&r1=493507&r2=493508
==============================================================================
--- directory/sandbox/triplesec-jacc2/pom.xml (original)
+++ directory/sandbox/triplesec-jacc2/pom.xml Sat Jan 6 09:06:49 2007
@@ -124,6 +124,11 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.4_spec</artifactId>
<version>1.0.1</version>
</dependency>
@@ -141,67 +146,67 @@
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core</artifactId>
- <version>1.0.0</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap</artifactId>
- <version>0.9.5.3</version>
+ <version>0.9.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-unit</artifactId>
- <version>1.0.0</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-kerberos-shared</artifactId>
- <version>1.0.0</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-kerberos</artifactId>
- <version>1.0.0</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-server-ssl</artifactId>
- <version>1.0.0</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-server-tools</artifactId>
- <version>1.0.0</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-shared</artifactId>
- <version>1.0.0</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-server-jndi</artifactId>
- <version>1.0.0</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-asn1-codec</artifactId>
- <version>0.9.5.3</version>
+ <version>0.9.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.directory.daemon</groupId>
<artifactId>daemon-bootstrappers</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -414,18 +419,18 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.2</version>
<configuration>
- <forkMode>once</forkMode>
- <argLine>-enableassertions -Dgeronimo.bootstrap.logging.enabled=false -Dlog4j.configuration=org/apache/geronimo/test-log4j.properties</argLine>
+ <forkMode>never</forkMode>
+ <argLine>-enableassertions</argLine>
<workingDirectory>${project.build.directory}</workingDirectory>
<!-- Override the default, do not accept Test* as test classes -->
- <excludes>
- <exclude>**/Abstract*.java</exclude>
- <exclude>**/Test*.java</exclude>
- </excludes>
- <includes>
- <include>**/*Test.java</include>
- </includes>
+ <!--<excludes>-->
+ <!--<exclude>**/Abstract*.java</exclude>-->
+ <!--<exclude>**/Test*.java</exclude>-->
+ <!--</excludes>-->
+ <!--<includes>-->
+ <!--<include>**/*Test.java</include>-->
+ <!--</includes>-->
</configuration>
</plugin>
@@ -536,18 +541,18 @@
<plugin>
<groupId>org.apache.directory.daemon</groupId>
<artifactId>daemon-plugin</artifactId>
- <version>1.0.0</version>
+ <version>1.5.0-SNAPSHOT</version>
</plugin>
<plugin>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-plugin</artifactId>
- <version>1.0.0</version>
+ <version>1.5.0-SNAPSHOT</version>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.0pre0</version>
+ <version>6.1.0rc2</version>
</plugin>
</plugins>
@@ -567,7 +572,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
</plugin>
@@ -638,7 +642,11 @@
<module>profile</module>
<module>testdata</module>
<module>jaas</module>
+<!--
+ <module>jacc</module>
+-->
<module>sms</module>
+ <module>itest-data</module>
<module>store</module>
<module>verifier</module>
<module>main</module>
@@ -678,6 +686,9 @@
<module>profile</module>
<module>testdata</module>
<module>jaas</module>
+<!--
+ <module>jacc</module>
+-->
<module>sms</module>
<module>store</module>
<module>verifier</module>
@@ -734,6 +745,7 @@
<module>profile</module>
<module>testdata</module>
<module>jaas</module>
+ <module>jacc</module>
<module>sms</module>
<module>store</module>
<module>verifier</module>
Modified: directory/sandbox/triplesec-jacc2/swing-admin/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc2/swing-admin/pom.xml?view=diff&rev=493508&r1=493507&r2=493508
==============================================================================
--- directory/sandbox/triplesec-jacc2/swing-admin/pom.xml (original)
+++ directory/sandbox/triplesec-jacc2/swing-admin/pom.xml Sat Jan 6 09:06:49 2007
@@ -41,8 +41,15 @@
<groupId>${pom.groupId}</groupId>
<artifactId>triplesec-integration</artifactId>
<version>${pom.version}</version>
+ <scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>triplesec-itest-data</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>triplesec-admin-api</artifactId>
@@ -135,6 +142,30 @@
</activation>
<build>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-itest-data</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>triplesec-itest-data</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/serverHome/conf</outputDirectory>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
Modified: directory/sandbox/triplesec-jacc2/swing-demo/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc2/swing-demo/pom.xml?view=diff&rev=493508&r1=493507&r2=493508
==============================================================================
--- directory/sandbox/triplesec-jacc2/swing-demo/pom.xml (original)
+++ directory/sandbox/triplesec-jacc2/swing-demo/pom.xml Sat Jan 6 09:06:49 2007
@@ -53,6 +53,12 @@
<version>${pom.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>triplesec-itest-data</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -129,8 +135,33 @@
<activation>
<property><name>integration</name></property>
</activation>
- <build>
+ <build>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-itest-data</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>triplesec-itest-data</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/serverHome/conf</outputDirectory>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
+
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
Modified: directory/sandbox/triplesec-jacc2/tools/src/main/java/org/safehaus/triplesec/tools/Tools.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc2/tools/src/main/java/org/safehaus/triplesec/tools/Tools.java?view=diff&rev=493508&r1=493507&r2=493508
==============================================================================
--- directory/sandbox/triplesec-jacc2/tools/src/main/java/org/safehaus/triplesec/tools/Tools.java (original)
+++ directory/sandbox/triplesec-jacc2/tools/src/main/java/org/safehaus/triplesec/tools/Tools.java Sat Jan 6 09:06:49 2007
@@ -21,15 +21,11 @@
import java.io.IOException;
-import java.net.URL;
import java.util.Properties;
import org.apache.commons.cli.CommandLine;
-import org.apache.directory.server.configuration.ServerStartupConfiguration;
import org.apache.directory.server.tools.BaseCommand;
-import org.apache.directory.server.tools.ToolCommand;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.FileSystemXmlApplicationContext;
+import org.apache.directory.server.tools.request.BaseToolCommandCL;
/**
@@ -74,7 +70,7 @@
System.exit( 0 );
}
- ToolCommand cmd = ( ToolCommand ) tools.getCommands().get( command );
+ BaseToolCommandCL cmd = (BaseToolCommandCL) tools.getCommands().get( command );
if ( cmd == null )
{
System.err.println( "Unknown command: " + args[0] );
@@ -96,15 +92,16 @@
cmd.setVersion( tools.getProductVersion() );
if ( cmdline.getOptionValue( 'i' ) != null )
{
- cmd.setLayout( cmdline.getOptionValue( 'i' ) );
- if ( !cmd.isQuietEnabled() )
- {
- System.out.println( "loading settings from: " + cmd.getLayout().getConfigurationFile() );
- }
- ApplicationContext factory = null;
- URL configUrl = cmd.getLayout().getConfigurationFile().toURL();
- factory = new FileSystemXmlApplicationContext( configUrl.toString() );
- cmd.setConfiguration( ( ServerStartupConfiguration ) factory.getBean( "configuration" ) );
+ cmd.processOptions(cmdline);
+// cmd.setLayout( cmdline.getOptionValue( 'i' ) );
+// if ( !cmd.isQuietEnabled() )
+// {
+// System.out.println( "loading settings from: " + cmd.getLayout().getConfigurationFile() );
+// }
+// ApplicationContext factory = null;
+// URL configUrl = cmd.getLayout().getConfigurationFile().toURL();
+// factory = new FileSystemXmlApplicationContext( configUrl.toString() );
+// cmd.setConfiguration( ( ServerStartupConfiguration ) factory.getBean( "configuration" ) );
}
else if ( cmdline.hasOption( 'c' ) )
{
@@ -112,7 +109,7 @@
System.exit( 1 );
}
- cmd.execute( cmdline );
+ cmd.execute( cmdline, null );
}
Modified: directory/sandbox/triplesec-jacc2/webapp-changelog/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc2/webapp-changelog/pom.xml?view=diff&rev=493508&r1=493507&r2=493508
==============================================================================
--- directory/sandbox/triplesec-jacc2/webapp-changelog/pom.xml (original)
+++ directory/sandbox/triplesec-jacc2/webapp-changelog/pom.xml Sat Jan 6 09:06:49 2007
@@ -41,6 +41,12 @@
<version>${pom.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>triplesec-itest-data</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>triplesec-changelog</artifactId>
@@ -149,6 +155,30 @@
</activation>
<build>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-itest-data</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>triplesec-itest-data</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/serverHome/conf</outputDirectory>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
Modified: directory/sandbox/triplesec-jacc2/webapp-config/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc2/webapp-config/pom.xml?view=diff&rev=493508&r1=493507&r2=493508
==============================================================================
--- directory/sandbox/triplesec-jacc2/webapp-config/pom.xml (original)
+++ directory/sandbox/triplesec-jacc2/webapp-config/pom.xml Sat Jan 6 09:06:49 2007
@@ -65,6 +65,12 @@
<version>${pom.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>triplesec-itest-data</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>triplesec-wicket-tools</artifactId>
@@ -142,6 +148,30 @@
</activation>
<build>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-itest-data</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>triplesec-itest-data</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/serverHome/conf</outputDirectory>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
Modified: directory/sandbox/triplesec-jacc2/webapp-demo/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc2/webapp-demo/pom.xml?view=diff&rev=493508&r1=493507&r2=493508
==============================================================================
--- directory/sandbox/triplesec-jacc2/webapp-demo/pom.xml (original)
+++ directory/sandbox/triplesec-jacc2/webapp-demo/pom.xml Sat Jan 6 09:06:49 2007
@@ -68,6 +68,12 @@
<version>${pom.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>triplesec-itest-data</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>triplesec-main</artifactId>
@@ -123,6 +129,30 @@
</activation>
<build>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-itest-data</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>triplesec-itest-data</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/serverHome/conf</outputDirectory>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
Modified: directory/sandbox/triplesec-jacc2/webapp-registration/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc2/webapp-registration/pom.xml?view=diff&rev=493508&r1=493507&r2=493508
==============================================================================
--- directory/sandbox/triplesec-jacc2/webapp-registration/pom.xml (original)
+++ directory/sandbox/triplesec-jacc2/webapp-registration/pom.xml Sat Jan 6 09:06:49 2007
@@ -65,6 +65,12 @@
<version>${pom.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>triplesec-itest-data</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>triplesec-wicket-tools</artifactId>
@@ -130,6 +136,30 @@
</activation>
<build>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-itest-data</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>triplesec-itest-data</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/serverHome/conf</outputDirectory>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
Modified: directory/sandbox/triplesec-jacc2/webapp-servlet-demo/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc2/webapp-servlet-demo/pom.xml?view=diff&rev=493508&r1=493507&r2=493508
==============================================================================
--- directory/sandbox/triplesec-jacc2/webapp-servlet-demo/pom.xml (original)
+++ directory/sandbox/triplesec-jacc2/webapp-servlet-demo/pom.xml Sat Jan 6 09:06:49 2007
@@ -27,20 +27,6 @@
<artifactId>triplesec-webapp-servlet-demo</artifactId>
<name>Triplesec Webapp Servlet Demo</name>
<packaging>war</packaging>
- <repositories>
- <!-- For apacheds snapshots -->
- <repository>
- <id>apachecvs</id>
- <name>Apache Snapshot Repository</name>
- <url>http://cvs.apache.org/maven-snapshot-repository</url>
- </repository>
-
- <repository>
- <id>safehaus</id>
- <name>Alternate Repository for Safehaus Artifacts</name>
- <url>http://m2.safehaus.org</url>
- </repository>
- </repositories>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -62,6 +48,12 @@
<version>${pom.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>triplesec-itest-data</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.4_spec</artifactId>
@@ -102,6 +94,30 @@
</activation>
<build>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-itest-data</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>triplesec-itest-data</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/serverHome/conf</outputDirectory>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
Modified: directory/sandbox/triplesec-jacc2/webapp-wicket-admin/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc2/webapp-wicket-admin/pom.xml?view=diff&rev=493508&r1=493507&r2=493508
==============================================================================
--- directory/sandbox/triplesec-jacc2/webapp-wicket-admin/pom.xml (original)
+++ directory/sandbox/triplesec-jacc2/webapp-wicket-admin/pom.xml Sat Jan 6 09:06:49 2007
@@ -68,7 +68,14 @@
<groupId>${pom.groupId}</groupId>
<artifactId>triplesec-integration</artifactId>
<version>${pom.version}</version>
+ <scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>triplesec-itest-data</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>triplesec-admin-api</artifactId>
@@ -115,6 +122,30 @@
</activation>
<build>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-itest-data</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>triplesec-itest-data</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/serverHome/conf</outputDirectory>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>