[jboss-cvs] Picketlink SVN: r213 - in idm/trunk: integration/deployer and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Apr 27 08:41:22 EDT 2010
Author: bdaw
Date: 2010-04-27 08:41:20 -0400 (Tue, 27 Apr 2010)
New Revision: 213
Modified:
idm/trunk/example/simple/pom.xml
idm/trunk/integration/deployer/pom.xml
idm/trunk/parent/pom.xml
idm/trunk/picketlink-idm-auth/pom.xml
idm/trunk/picketlink-idm-docs/ReferenceGuide/pom.xml
idm/trunk/picketlink-idm-testsuite/pom.xml
idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/LDAPTestPOJO.java
idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/APILDAPTestCase.java
idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/APITestCase.java
idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/MinimalFlexibleConfigTestCase.java
idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/OrganizationLDAPTestCase.java
idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/OrganizationTestCase.java
idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/SimpleTestCase.java
idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/store/hibernate/EvilBinaryTestCase.java
idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java
idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/store/hibernate/HibernateModelTestCase.java
idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreTestCase.java
Log:
- fix the build to work with new nexus repo and jboss-nexus profile in settings.xml (as in jboss.org maven wiki)
- remove jboss unit dependency
Modified: idm/trunk/example/simple/pom.xml
===================================================================
--- idm/trunk/example/simple/pom.xml 2010-04-23 22:06:00 UTC (rev 212)
+++ idm/trunk/example/simple/pom.xml 2010-04-27 12:41:20 UTC (rev 213)
@@ -120,7 +120,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>apache-collections</groupId>
+ <groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.1</version>
</dependency>
Modified: idm/trunk/integration/deployer/pom.xml
===================================================================
--- idm/trunk/integration/deployer/pom.xml 2010-04-23 22:06:00 UTC (rev 212)
+++ idm/trunk/integration/deployer/pom.xml 2010-04-27 12:41:20 UTC (rev 213)
@@ -81,12 +81,24 @@
<artifactId>jboss-deployers-structure-spi</artifactId>
<version>${jboss.deployers.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-vfs-spi</artifactId>
<version>${jboss.deployers.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
Modified: idm/trunk/parent/pom.xml
===================================================================
--- idm/trunk/parent/pom.xml 2010-04-23 22:06:00 UTC (rev 212)
+++ idm/trunk/parent/pom.xml 2010-04-27 12:41:20 UTC (rev 213)
@@ -500,7 +500,7 @@
<id>repository.jboss.org</id>
<name>JBoss Repository</name>
<layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
+ <url>http://repository.jboss.org/maven2</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
@@ -510,7 +510,7 @@
<id>snapshots.jboss.org</id>
<name>JBoss Snapshots Repository</name>
<layout>default</layout>
- <url>http://snapshots.jboss.org/maven2/</url>
+ <url>http://snapshots.jboss.org/maven2</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
Modified: idm/trunk/picketlink-idm-auth/pom.xml
===================================================================
--- idm/trunk/picketlink-idm-auth/pom.xml 2010-04-23 22:06:00 UTC (rev 212)
+++ idm/trunk/picketlink-idm-auth/pom.xml 2010-04-27 12:41:20 UTC (rev 213)
@@ -38,9 +38,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.security</groupId>
- <artifactId>jacc</artifactId>
- <version>1.0</version>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jacc-api</artifactId>
+ <version>1.1.0.GA</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: idm/trunk/picketlink-idm-docs/ReferenceGuide/pom.xml
===================================================================
--- idm/trunk/picketlink-idm-docs/ReferenceGuide/pom.xml 2010-04-23 22:06:00 UTC (rev 212)
+++ idm/trunk/picketlink-idm-docs/ReferenceGuide/pom.xml 2010-04-27 12:41:20 UTC (rev 213)
@@ -11,13 +11,13 @@
<artifactId>Reference-Guide-${translation}</artifactId>
<packaging>jdocbook</packaging>
<name>User Guide (${translation})</name>
-
+
<build>
<plugins>
<plugin>
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.1.2</version>
+ <version>2.1.1</version>
<extensions>true</extensions>
<dependencies>
<dependency>
@@ -76,6 +76,7 @@
</build>
<properties>
- <translation>en-US</translation>
+ <translation>en-US</translation>
+ <enforcer.skip>true</enforcer.skip>
</properties>
</project>
Modified: idm/trunk/picketlink-idm-testsuite/pom.xml
===================================================================
--- idm/trunk/picketlink-idm-testsuite/pom.xml 2010-04-23 22:06:00 UTC (rev 212)
+++ idm/trunk/picketlink-idm-testsuite/pom.xml 2010-04-27 12:41:20 UTC (rev 213)
@@ -76,16 +76,8 @@
<scope>test</scope>
</dependency>
- <!--JBoss Unit-->
-
<dependency>
<groupId>org.jboss.unit</groupId>
- <artifactId>jboss-unit</artifactId>
- <version>1.2.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.unit</groupId>
<artifactId>portal-test</artifactId>
<version>1.2.2</version>
@@ -96,6 +88,22 @@
<artifactId>hibernate3</artifactId>
</exclusion>
<exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>sun-opends</groupId>
<artifactId>opends-core</artifactId>
</exclusion>
@@ -116,18 +124,6 @@
</dependency>
<dependency>
<groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>2.0.2.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-jdk</artifactId>
- <version>2.0.2.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
<artifactId>jboss-logging-log4j</artifactId>
<version>2.0.2.GA</version>
<scope>test</scope>
@@ -144,10 +140,6 @@
<version>1.2.2</version>
<scope>test</scope>
</dependency>
-
-
-
-
</dependencies>
Modified: idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/LDAPTestPOJO.java
===================================================================
--- idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/LDAPTestPOJO.java 2010-04-23 22:06:00 UTC (rev 212)
+++ idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/LDAPTestPOJO.java 2010-04-27 12:41:20 UTC (rev 213)
@@ -24,7 +24,6 @@
import org.picketlink.idm.opends.OpenDSService;
import org.jboss.portal.test.framework.embedded.DSConfig;
-import org.jboss.unit.api.pojo.annotations.Parameter;
import java.net.URL;
import java.util.Hashtable;
@@ -124,7 +123,6 @@
}
- @Parameter
public void setDirectoryName(String directoryName)
{
this.directoryName = directoryName;
Modified: idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/APILDAPTestCase.java
===================================================================
--- idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/APILDAPTestCase.java 2010-04-23 22:06:00 UTC (rev 212)
+++ idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/APILDAPTestCase.java 2010-04-27 12:41:20 UTC (rev 213)
@@ -25,10 +25,8 @@
import org.picketlink.idm.api.IdentitySessionFactory;
import org.picketlink.idm.impl.LDAPTestPOJO;
import org.picketlink.idm.impl.configuration.IdentityConfigurationImpl;
-import org.jboss.unit.api.pojo.annotations.Create;
-import org.jboss.unit.api.pojo.annotations.Destroy;
-import org.jboss.unit.api.pojo.annotations.Test;
+
/**
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
* @version : 0.1 $
@@ -50,7 +48,6 @@
IdentitySessionFactory identitySessionFactory;
- @Create
public void setUp() throws Exception
{
super.start();
@@ -71,7 +68,6 @@
configure(getIdentityConfig()).buildIdentitySessionFactory();
}
- @Destroy
public void tearDown() throws Exception
{
super.stop();
@@ -82,31 +78,26 @@
return identitySessionFactory;
}
- @Test
public void testPersistenceManager() throws Exception
{
persistenceManagerTest.testMethods(getRealmName());
}
- @Test
public void testRelationshipManager() throws Exception
{
relationshipManagerTest.testMethods(getRealmName());
}
- @Test
public void testRelationshipManagerCascade() throws Exception
{
relationshipManagerTest.testCascade(getRealmName());
}
- @Test
public void testRelationshipManagerMergedRoleAssociations() throws Exception
{
relationshipManagerTest.testMergedRoleAssociations(getRealmName());
}
- @Test
public void testRoleManager() throws Exception
{
roleManagerTest.testMethods(getRealmName());
Modified: idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/APITestCase.java
===================================================================
--- idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/APITestCase.java 2010-04-23 22:06:00 UTC (rev 212)
+++ idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/APITestCase.java 2010-04-27 12:41:20 UTC (rev 213)
@@ -25,10 +25,8 @@
import org.picketlink.idm.api.IdentitySessionFactory;
import org.picketlink.idm.impl.IdentityTestPOJO;
import org.picketlink.idm.impl.configuration.IdentityConfigurationImpl;
-import org.jboss.unit.api.pojo.annotations.Create;
-import org.jboss.unit.api.pojo.annotations.Destroy;
-import org.jboss.unit.api.pojo.annotations.Test;
+
/**
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
* @version : 0.1 $
@@ -50,7 +48,6 @@
IdentitySessionFactory identitySessionFactory;
- @Create
public void setUp() throws Exception
{
super.start();
@@ -69,7 +66,6 @@
configure(getIdentityConfig()).buildIdentitySessionFactory();
}
- @Destroy
public void tearDown() throws Exception
{
super.stop();
@@ -80,49 +76,41 @@
return identitySessionFactory;
}
- @Test
public void testPersistenceManager() throws Exception
{
persistenceManagerTest.testMethods(getRealmName());
}
- @Test
public void testRelationshipManager() throws Exception
{
relationshipManagerTest.testMethods(getRealmName());
}
- @Test
public void testRelationshipManagerCascade() throws Exception
{
relationshipManagerTest.testCascade(getRealmName());
}
- @Test
public void testRelationshipManagerMergedRoleAssociations() throws Exception
{
relationshipManagerTest.testMergedRoleAssociations(getRealmName());
}
- @Test
public void testRoleManager() throws Exception
{
roleManagerTest.testMethods(getRealmName());
}
- @Test
public void testUserQuery() throws Exception
{
userQueryTest.testQuery(getRealmName());
}
- @Test
public void testGroupQuery() throws Exception
{
groupQueryTest.testQuery(getRealmName());
}
- @Test
public void testRoleQuery() throws Exception
{
roleQueryTest.testQuery(getRealmName());
Modified: idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/MinimalFlexibleConfigTestCase.java
===================================================================
--- idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/MinimalFlexibleConfigTestCase.java 2010-04-23 22:06:00 UTC (rev 212)
+++ idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/MinimalFlexibleConfigTestCase.java 2010-04-27 12:41:20 UTC (rev 213)
@@ -25,10 +25,6 @@
import org.picketlink.idm.impl.IdentityTestPOJO;
import org.picketlink.idm.impl.configuration.IdentityConfigurationImpl;
import org.picketlink.idm.api.IdentitySessionFactory;
-import org.jboss.unit.api.pojo.annotations.Create;
-import org.jboss.unit.api.pojo.annotations.Destroy;
-import org.jboss.unit.api.pojo.annotations.Test;
-import org.jboss.unit.api.pojo.annotations.Parameter;
/**
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
@@ -52,7 +48,6 @@
private IdentitySessionFactory identitySessionFactory;
- @Create
public void setUp() throws Exception
{
setIdentityConfig("minimal-flexible-identity-config.xml");
@@ -74,7 +69,6 @@
configure(getIdentityConfig()).buildIdentitySessionFactory();
}
- @Destroy
public void tearDown() throws Exception
{
super.stop();
@@ -85,63 +79,53 @@
return identitySessionFactory;
}
- @Test
public void testOrganization() throws Exception
{
orgTest.testRedHatOrganization(getRealmName());
}
- @Test
public void testSamplePortal() throws Exception
{
orgTest.testSamplePortal(getRealmName());
}
- @Test
public void testPersistenceManager() throws Exception
{
persistenceManagerTest.testMethods(getRealmName());
}
- @Test
public void testRelationshipManager() throws Exception
{
relationshipManagerTest.testMethods(getRealmName());
}
- @Test
public void testRelationshipManagerCascade() throws Exception
{
relationshipManagerTest.testCascade(getRealmName());
}
- @Test
public void testRelationshipManagerMergedRoleAssociations() throws Exception
{
relationshipManagerTest.testMergedRoleAssociations(getRealmName());
}
- @Test
public void testRoleManager() throws Exception
{
roleManagerTest.testMethods(getRealmName());
}
- @Test
public void testUserQuery() throws Exception
{
userQueryTest.testQuery(getRealmName());
}
- @Test
public void testGroupQuery() throws Exception
{
groupQueryTest.testQuery(getRealmName());
}
- @Test
public void testRoleQuery() throws Exception
{
roleQueryTest.testQuery(getRealmName());
Modified: idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/OrganizationLDAPTestCase.java
===================================================================
--- idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/OrganizationLDAPTestCase.java 2010-04-23 22:06:00 UTC (rev 212)
+++ idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/OrganizationLDAPTestCase.java 2010-04-27 12:41:20 UTC (rev 213)
@@ -25,10 +25,6 @@
import org.picketlink.idm.api.IdentitySessionFactory;
import org.picketlink.idm.impl.LDAPTestPOJO;
import org.picketlink.idm.impl.configuration.IdentityConfigurationImpl;
-import org.jboss.unit.api.pojo.annotations.Create;
-import org.jboss.unit.api.pojo.annotations.Destroy;
-import org.jboss.unit.api.pojo.annotations.Parameter;
-import org.jboss.unit.api.pojo.annotations.Test;
/**
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
@@ -45,7 +41,6 @@
private String sampleOrganizationRealmName = "realm://RedHat/DB_LDAP";
- @Create
public void setUp() throws Exception
{
super.start();
@@ -58,7 +53,6 @@
configure(getIdentityConfig()).buildIdentitySessionFactory();
}
- @Destroy
public void tearDown() throws Exception
{
super.stop();
@@ -69,14 +63,12 @@
return identitySessionFactory;
}
- @Test
public void testOrganization() throws Exception
{
orgTest.testRedHatOrganization(getSampleOrganizationRealmName());
}
- @Test
public void testSamplePortal() throws Exception
{
@@ -89,7 +81,6 @@
return samplePortalRealmName;
}
- @Parameter
public void setSamplePortalRealmName(String samplePortalRealmName)
{
this.samplePortalRealmName = samplePortalRealmName;
@@ -100,7 +91,6 @@
return sampleOrganizationRealmName;
}
- @Parameter
public void setSampleOrganizationRealmName(String sampleOrganizationRealmName)
{
this.sampleOrganizationRealmName = sampleOrganizationRealmName;
Modified: idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/OrganizationTestCase.java
===================================================================
--- idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/OrganizationTestCase.java 2010-04-23 22:06:00 UTC (rev 212)
+++ idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/OrganizationTestCase.java 2010-04-27 12:41:20 UTC (rev 213)
@@ -25,10 +25,6 @@
import org.picketlink.idm.impl.IdentityTestPOJO;
import org.picketlink.idm.impl.configuration.IdentityConfigurationImpl;
import org.picketlink.idm.api.IdentitySessionFactory;
-import org.jboss.unit.api.pojo.annotations.Create;
-import org.jboss.unit.api.pojo.annotations.Destroy;
-import org.jboss.unit.api.pojo.annotations.Test;
-import org.jboss.unit.api.pojo.annotations.Parameter;
/**
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
@@ -49,7 +45,6 @@
private String sampleOrganizationRealmCloneName = "realm://RedHat/DB-clone";
- @Create
public void setUp() throws Exception
{
super.start();
@@ -60,7 +55,6 @@
configure(getIdentityConfig()).buildIdentitySessionFactory();
}
- @Destroy
public void tearDown() throws Exception
{
super.stop();
@@ -71,7 +65,6 @@
return identitySessionFactory;
}
- @Test
public void testOrganization() throws Exception
{
@@ -79,7 +72,6 @@
orgTest.testRedHatOrganization(getSampleOrganizationRealmCloneName());
}
- @Test
public void testSamplePortal() throws Exception
{
@@ -93,7 +85,6 @@
return samplePortalRealmName;
}
- @Parameter
public void setSamplePortalRealmName(String samplePortalRealmName)
{
this.samplePortalRealmName = samplePortalRealmName;
@@ -104,7 +95,6 @@
return sampleOrganizationRealmName;
}
- @Parameter
public void setSampleOrganizationRealmName(String sampleOrganizationRealmName)
{
this.sampleOrganizationRealmName = sampleOrganizationRealmName;
Modified: idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/SimpleTestCase.java
===================================================================
--- idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/SimpleTestCase.java 2010-04-23 22:06:00 UTC (rev 212)
+++ idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/SimpleTestCase.java 2010-04-27 12:41:20 UTC (rev 213)
@@ -26,9 +26,6 @@
import org.picketlink.idm.api.IdentitySession;
import org.picketlink.idm.impl.IdentityTestPOJO;
import org.picketlink.idm.impl.configuration.IdentityConfigurationImpl;
-import org.jboss.unit.api.pojo.annotations.Create;
-import org.jboss.unit.api.pojo.annotations.Destroy;
-import org.jboss.unit.api.pojo.annotations.Test;
import java.util.logging.Logger;
@@ -45,7 +42,6 @@
IdentitySessionFactory identitySessionFactory;
- @Create
public void setUp() throws Exception
{
super.start();
@@ -61,7 +57,6 @@
}
- @Destroy
public void tearDown() throws Exception
{
super.stop();
@@ -72,7 +67,6 @@
return identitySessionFactory;
}
- @Test
public void testPersistenceManager() throws Exception
{
IdentitySession session = identitySessionFactory.createIdentitySession(getRealmName());
Modified: idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/store/hibernate/EvilBinaryTestCase.java
===================================================================
--- idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/store/hibernate/EvilBinaryTestCase.java 2010-04-23 22:06:00 UTC (rev 212)
+++ idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/store/hibernate/EvilBinaryTestCase.java 2010-04-27 12:41:20 UTC (rev 213)
@@ -24,9 +24,6 @@
import org.picketlink.idm.impl.model.hibernate.*;
import org.picketlink.idm.impl.IdentityTestPOJO;
-import org.jboss.unit.api.pojo.annotations.Destroy;
-import org.jboss.unit.api.pojo.annotations.Create;
-import org.jboss.unit.api.pojo.annotations.Test;
import org.hibernate.Session;
import org.hibernate.criterion.Projections;
@@ -46,19 +43,16 @@
}
- @Create
public void setUp() throws Exception
{
super.start();
}
- @Destroy
public void tearDown() throws Exception
{
super.stop();
}
- @Test
public void testBinary() throws Exception
{
begin();
Modified: idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java
===================================================================
--- idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java 2010-04-23 22:06:00 UTC (rev 212)
+++ idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java 2010-04-27 12:41:20 UTC (rev 213)
@@ -41,8 +41,6 @@
import org.picketlink.idm.impl.api.SimpleAttribute;
import org.picketlink.idm.impl.IdentityTestPOJO;
import org.picketlink.idm.common.exception.IdentityException;
-import org.jboss.unit.api.pojo.annotations.Create;
-import org.jboss.unit.api.pojo.annotations.Test;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
@@ -67,7 +65,6 @@
}
- @Create
public void setUp() throws Exception
{
super.start();
@@ -171,7 +168,6 @@
// Tests
- @Test
public void testStorePersistence() throws Exception
{
@@ -179,7 +175,6 @@
}
- @Test
public void testFindMethods() throws Exception
{
@@ -237,7 +232,6 @@
commit();
}
- @Test
public void testAttributes() throws Exception
{
@@ -350,13 +344,11 @@
}
- @Test
public void testRelationships() throws Exception
{
commonTest.testRelationships();
}
- @Test
public void testPasswordCredentials() throws Exception
{
commonTest.testPasswordCredential();
@@ -367,7 +359,6 @@
commonTest.testBinaryCredential();
}
- @Test
public void testCriteria() throws Exception
{
commonTest.testCriteria();
Modified: idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/store/hibernate/HibernateModelTestCase.java
===================================================================
--- idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/store/hibernate/HibernateModelTestCase.java 2010-04-23 22:06:00 UTC (rev 212)
+++ idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/store/hibernate/HibernateModelTestCase.java 2010-04-27 12:41:20 UTC (rev 213)
@@ -24,10 +24,6 @@
import org.picketlink.idm.impl.model.hibernate.*;
import org.picketlink.idm.impl.IdentityTestPOJO;
-import org.picketlink.idm.impl.api.PasswordCredential;
-import org.jboss.unit.api.pojo.annotations.Destroy;
-import org.jboss.unit.api.pojo.annotations.Create;
-import org.jboss.unit.api.pojo.annotations.Test;
import org.hibernate.Session;
import org.hibernate.Query;
@@ -48,19 +44,16 @@
}
- @Create
public void setUp() throws Exception
{
super.start();
}
- @Destroy
public void tearDown() throws Exception
{
super.stop();
}
- @Test
public void testPersistence() {
@@ -121,7 +114,6 @@
}
- @Test
public void testRelationships()
{
begin();
@@ -190,7 +182,6 @@
}
- @Test
public void testNameTypeConstraint() throws Exception
{
@@ -287,7 +278,6 @@
}
- @Test
public void testAttributes() throws Exception
{
begin();
Modified: idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreTestCase.java
===================================================================
--- idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreTestCase.java 2010-04-23 22:06:00 UTC (rev 212)
+++ idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreTestCase.java 2010-04-27 12:41:20 UTC (rev 213)
@@ -35,9 +35,6 @@
import org.picketlink.idm.spi.store.IdentityStore;
import org.picketlink.idm.spi.store.IdentityStoreInvocationContext;
import org.picketlink.idm.spi.store.IdentityStoreSession;
-import org.jboss.unit.api.pojo.annotations.Create;
-import org.jboss.unit.api.pojo.annotations.Destroy;
-import org.jboss.unit.api.pojo.annotations.Test;
import java.util.Hashtable;
@@ -65,7 +62,6 @@
}
- @Create
public void setUp() throws Exception
{
super.start();
@@ -122,7 +118,6 @@
};
}
- @Destroy
public void tearDown() throws Exception
{
super.stop();
@@ -148,7 +143,6 @@
// Tests
// Just test if OpenDS is running and was populated...
- @Test
public void testSimple() throws Exception
{
populateClean();
@@ -329,7 +323,6 @@
//
// }
- @Test
public void testRelationships() throws Exception
{
populateClean();
@@ -338,7 +331,6 @@
}
- @Test
public void testStorePersistence() throws Exception
{
populateClean();
@@ -347,7 +339,6 @@
}
- @Test
public void testFindMethods() throws Exception
{
populateClean();
@@ -356,7 +347,6 @@
}
- @Test
public void testCriteria() throws Exception
{
populateClean();
@@ -365,7 +355,6 @@
}
- @Test
public void testCredentials() throws Exception
{
populateClean();
More information about the jboss-cvs-commits
mailing list