directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r493584 - in /directory/sandbox/triplesec-jacc2/store: ./ src/test/java/org/safehaus/triplesec/store/interceptor/ src/test/resources/
Date Sat, 06 Jan 2007 21:49:20 GMT
Author: djencks
Date: Sat Jan  6 13:49:19 2007
New Revision: 493584

URL: http://svn.apache.org/viewvc?view=rev&rev=493584
Log:
Try to use itest-data files where possible.  I don't understand why ServerProfileStoreITest
doesn't work with normal server.ldif

Removed:
    directory/sandbox/triplesec-jacc2/store/src/test/resources/interceptor.ldif
    directory/sandbox/triplesec-jacc2/store/src/test/resources/log4j.properties
Modified:
    directory/sandbox/triplesec-jacc2/store/pom.xml
    directory/sandbox/triplesec-jacc2/store/src/test/java/org/safehaus/triplesec/store/interceptor/ApplicationACIManagerITest.java
    directory/sandbox/triplesec-jacc2/store/src/test/java/org/safehaus/triplesec/store/interceptor/PolicyProtectionInterceptorITest.java

Modified: directory/sandbox/triplesec-jacc2/store/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc2/store/pom.xml?view=diff&rev=493584&r1=493583&r2=493584
==============================================================================
--- directory/sandbox/triplesec-jacc2/store/pom.xml (original)
+++ directory/sandbox/triplesec-jacc2/store/pom.xml Sat Jan  6 13:49:19 2007
@@ -30,18 +30,19 @@
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>triplesec-testdata</artifactId>
+      <artifactId>triplesec-itest-data</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>triplesec-profile</artifactId>
+      <artifactId>triplesec-testdata</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>triplesec-jaas</artifactId>
+      <artifactId>triplesec-profile</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
@@ -148,6 +149,32 @@
       </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/store/src/test/java/org/safehaus/triplesec/store/interceptor/ApplicationACIManagerITest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc2/store/src/test/java/org/safehaus/triplesec/store/interceptor/ApplicationACIManagerITest.java?view=diff&rev=493584&r1=493583&r2=493584
==============================================================================
--- directory/sandbox/triplesec-jacc2/store/src/test/java/org/safehaus/triplesec/store/interceptor/ApplicationACIManagerITest.java
(original)
+++ directory/sandbox/triplesec-jacc2/store/src/test/java/org/safehaus/triplesec/store/interceptor/ApplicationACIManagerITest.java
Sat Jan  6 13:49:19 2007
@@ -94,7 +94,7 @@
         
         super.overrideEnvironment( Context.OBJECT_FACTORIES, ProfileObjectFactory.class.getName()
);
         super.overrideEnvironment( Context.STATE_FACTORIES, ProfileStateFactory.class.getName()
);
-        super.setLdifPath( "/interceptor.ldif", getClass() );
+        super.setLdifPath( "/server.ldif", getClass() );
         super.setUp();
 
         Hashtable env = new Hashtable();

Modified: directory/sandbox/triplesec-jacc2/store/src/test/java/org/safehaus/triplesec/store/interceptor/PolicyProtectionInterceptorITest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc2/store/src/test/java/org/safehaus/triplesec/store/interceptor/PolicyProtectionInterceptorITest.java?view=diff&rev=493584&r1=493583&r2=493584
==============================================================================
--- directory/sandbox/triplesec-jacc2/store/src/test/java/org/safehaus/triplesec/store/interceptor/PolicyProtectionInterceptorITest.java
(original)
+++ directory/sandbox/triplesec-jacc2/store/src/test/java/org/safehaus/triplesec/store/interceptor/PolicyProtectionInterceptorITest.java
Sat Jan  6 13:49:19 2007
@@ -94,7 +94,7 @@
 
         super.overrideEnvironment( Context.OBJECT_FACTORIES, ProfileObjectFactory.class.getName()
);
         super.overrideEnvironment( Context.STATE_FACTORIES, ProfileStateFactory.class.getName()
);
-        super.setLdifPath( "/interceptor.ldif", getClass() );
+        super.setLdifPath( "/server.ldif", getClass() );
         super.setUp();
 
         Hashtable env = new Hashtable();



Mime
View raw message