directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r664548 - in /directory/studio/trunk: ./ aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ apacheds-configuration/META-INF/ repository/ repository/net/ repository/net/sf/ repository/net/sf/swtbot/ repository/net/s...
Date Sun, 08 Jun 2008 20:18:14 GMT
Author: seelmann
Date: Sun Jun  8 13:18:14 2008
New Revision: 664548

URL: http://svn.apache.org/viewvc?rev=664548&view=rev
Log:
Merged testframework into trunk

Added:
    directory/studio/trunk/repository/net/
      - copied from r664542, directory/sandbox/seelmann/testingframework/repository/net/
    directory/studio/trunk/repository/net/sf/
      - copied from r664542, directory/sandbox/seelmann/testingframework/repository/net/sf/
    directory/studio/trunk/repository/net/sf/swtbot/
      - copied from r664542, directory/sandbox/seelmann/testingframework/repository/net/sf/swtbot/
    directory/studio/trunk/repository/net/sf/swtbot/eclipse/
      - copied from r664542, directory/sandbox/seelmann/testingframework/repository/net/sf/swtbot/eclipse/
    directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/
      - copied from r664542, directory/sandbox/seelmann/testingframework/repository/net/sf/swtbot/eclipse/finder/
    directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/1.0.0.574/
      - copied from r664542, directory/sandbox/seelmann/testingframework/repository/net/sf/swtbot/eclipse/finder/1.0.0.574/
    directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/1.0.0.574/finder-1.0.0.574.jar
      - copied unchanged from r664542, directory/sandbox/seelmann/testingframework/repository/net/sf/swtbot/eclipse/finder/1.0.0.574/finder-1.0.0.574.jar
    directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/1.0.0.574/finder-1.0.0.574.pom
      - copied unchanged from r664542, directory/sandbox/seelmann/testingframework/repository/net/sf/swtbot/eclipse/finder/1.0.0.574/finder-1.0.0.574.pom
    directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/maven-metadata.xml
      - copied unchanged from r664542, directory/sandbox/seelmann/testingframework/repository/net/sf/swtbot/eclipse/finder/maven-metadata.xml
    directory/studio/trunk/repository/net/sf/swtbot/finder/
      - copied from r664542, directory/sandbox/seelmann/testingframework/repository/net/sf/swtbot/finder/
    directory/studio/trunk/repository/net/sf/swtbot/finder/1.0.0.574/
      - copied from r664542, directory/sandbox/seelmann/testingframework/repository/net/sf/swtbot/finder/1.0.0.574/
    directory/studio/trunk/repository/net/sf/swtbot/finder/1.0.0.574/finder-1.0.0.574.jar
      - copied unchanged from r664542, directory/sandbox/seelmann/testingframework/repository/net/sf/swtbot/finder/1.0.0.574/finder-1.0.0.574.jar
    directory/studio/trunk/repository/net/sf/swtbot/finder/1.0.0.574/finder-1.0.0.574.pom
      - copied unchanged from r664542, directory/sandbox/seelmann/testingframework/repository/net/sf/swtbot/finder/1.0.0.574/finder-1.0.0.574.pom
    directory/studio/trunk/repository/net/sf/swtbot/finder/maven-metadata.xml
      - copied unchanged from r664542, directory/sandbox/seelmann/testingframework/repository/net/sf/swtbot/finder/maven-metadata.xml
    directory/studio/trunk/repository/org/eclipse/swt/examples/
      - copied from r664542, directory/sandbox/seelmann/testingframework/repository/org/eclipse/swt/examples/
    directory/studio/trunk/repository/org/eclipse/swt/examples/0.2.0.398-beta/
      - copied from r664542, directory/sandbox/seelmann/testingframework/repository/org/eclipse/swt/examples/0.2.0.398-beta/
    directory/studio/trunk/repository/org/eclipse/swt/examples/0.2.0.398-beta/examples-0.2.0.398-beta.jar
      - copied unchanged from r664542, directory/sandbox/seelmann/testingframework/repository/org/eclipse/swt/examples/0.2.0.398-beta/examples-0.2.0.398-beta.jar
    directory/studio/trunk/repository/org/eclipse/swt/examples/0.2.0.398-beta/examples-0.2.0.398-beta.jar.md5
      - copied unchanged from r664542, directory/sandbox/seelmann/testingframework/repository/org/eclipse/swt/examples/0.2.0.398-beta/examples-0.2.0.398-beta.jar.md5
    directory/studio/trunk/repository/org/eclipse/swt/examples/0.2.0.398-beta/examples-0.2.0.398-beta.jar.sha1
      - copied unchanged from r664542, directory/sandbox/seelmann/testingframework/repository/org/eclipse/swt/examples/0.2.0.398-beta/examples-0.2.0.398-beta.jar.sha1
    directory/studio/trunk/repository/org/eclipse/swt/examples/0.2.0.398-beta/examples-0.2.0.398-beta.pom
      - copied unchanged from r664542, directory/sandbox/seelmann/testingframework/repository/org/eclipse/swt/examples/0.2.0.398-beta/examples-0.2.0.398-beta.pom
    directory/studio/trunk/repository/org/eclipse/swt/examples/0.2.0.398-beta/examples-0.2.0.398-beta.pom.md5
      - copied unchanged from r664542, directory/sandbox/seelmann/testingframework/repository/org/eclipse/swt/examples/0.2.0.398-beta/examples-0.2.0.398-beta.pom.md5
    directory/studio/trunk/repository/org/eclipse/swt/examples/0.2.0.398-beta/examples-0.2.0.398-beta.pom.sha1
      - copied unchanged from r664542, directory/sandbox/seelmann/testingframework/repository/org/eclipse/swt/examples/0.2.0.398-beta/examples-0.2.0.398-beta.pom.sha1
    directory/studio/trunk/repository/org/eclipse/swt/examples/maven-metadata.xml
      - copied unchanged from r664542, directory/sandbox/seelmann/testingframework/repository/org/eclipse/swt/examples/maven-metadata.xml
    directory/studio/trunk/repository/org/eclipse/swt/examples/maven-metadata.xml.md5
      - copied unchanged from r664542, directory/sandbox/seelmann/testingframework/repository/org/eclipse/swt/examples/maven-metadata.xml.md5
    directory/studio/trunk/repository/org/eclipse/swt/examples/maven-metadata.xml.sha1
      - copied unchanged from r664542, directory/sandbox/seelmann/testingframework/repository/org/eclipse/swt/examples/maven-metadata.xml.sha1
Modified:
    directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapper.java
    directory/studio/trunk/apacheds-configuration/META-INF/MANIFEST.MF
    directory/studio/trunk/pom.xml
    directory/studio/trunk/repository/pom.xml

Modified: directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapper.java?rev=664548&r1=664547&r2=664548&view=diff
==============================================================================
--- directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapper.java
(original)
+++ directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapper.java
Sun Jun  8 13:18:14 2008
@@ -168,7 +168,7 @@
         {
             UserClass.Name name = ( UserClass.Name ) userClass;
             Set<LdapDN> jndiNames = name.getNames();
-            for ( Name jndiName : jndiNames )
+            for ( LdapDN jndiName : jndiNames )
             {
                 values.add( jndiName.toString() );
             }
@@ -177,7 +177,7 @@
         {
             UserClass.UserGroup userGrops = ( UserClass.UserGroup ) userClass;
             Set<LdapDN> jndiNames = userGrops.getNames();
-            for ( Name jndiName : jndiNames )
+            for ( LdapDN jndiName : jndiNames )
             {
                 values.add( jndiName.toString() );
             }

Modified: directory/studio/trunk/apacheds-configuration/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration/META-INF/MANIFEST.MF?rev=664548&r1=664547&r2=664548&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-configuration/META-INF/MANIFEST.MF (original)
+++ directory/studio/trunk/apacheds-configuration/META-INF/MANIFEST.MF Sun Jun  8 13:18:14
2008
@@ -14,6 +14,19 @@
  org.eclipse.jface.text,
  org.eclipse.ui.ide,
  org.eclipse.core.resources
+Export-Package: org.apache.directory.studio.apacheds.configuration,
+ org.apache.directory.studio.apacheds.configuration.editor,
+ org.apache.directory.studio.apacheds.configuration.editor.v150,
+ org.apache.directory.studio.apacheds.configuration.editor.v150.dialogs,
+ org.apache.directory.studio.apacheds.configuration.editor.v151,
+ org.apache.directory.studio.apacheds.configuration.editor.v151.dialogs,
+ org.apache.directory.studio.apacheds.configuration.editor.v152,
+ org.apache.directory.studio.apacheds.configuration.editor.v152.dialogs,
+ org.apache.directory.studio.apacheds.configuration.model,
+ org.apache.directory.studio.apacheds.configuration.model.v150,
+ org.apache.directory.studio.apacheds.configuration.model.v151,
+ org.apache.directory.studio.apacheds.configuration.model.v152,
+ org.apache.directory.studio.apacheds.configuration.wizards
 Bundle-ClassPath: .
 Export-Package: org.apache.directory.studio.apacheds.configuration,
  org.apache.directory.studio.apacheds.configuration.editor,

Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=664548&r1=664547&r2=664548&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Sun Jun  8 13:18:14 2008
@@ -87,6 +87,8 @@
     <studio.dsml.parser.version>0.4.2.SNAPSHOT</studio.dsml.parser.version>
     <updatesite.version>1.2.0.SNAPSHOT</updatesite.version>
     <valueeditors.version>1.2.0.SNAPSHOT</valueeditors.version>
+    <test.integration.core.version>1.2.0.SNAPSHOT</test.integration.core.version>
+    <test.integration.ui.version>1.2.0.SNAPSHOT</test.integration.ui.version>
   </properties>
 
   <profiles>
@@ -1608,6 +1610,16 @@
         <artifactId>apacheds.configuration.help</artifactId>
         <version>${apacheds.configuration.help.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>test.integration.core</artifactId>
+        <version>${test.integration.core.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>test.integration.ui</artifactId>
+        <version>${test.integration.ui.version}</version>
+      </dependency>
 
       <!-- Apache Directory Shared -->
       <dependency>
@@ -1704,6 +1716,18 @@
         <artifactId>nlog4j</artifactId>
         <version>1.2.25</version>
       </dependency>
+
+      <dependency>
+        <groupId>net.sf.swtbot.eclipse</groupId>
+        <artifactId>finder</artifactId>
+        <version>1.0.0.574</version>
+      </dependency>
+      <dependency>
+        <groupId>net.sf.swtbot</groupId>
+        <artifactId>finder</artifactId>
+        <version>1.0.0.574</version>
+      </dependency>
+
     </dependencies>
   </dependencyManagement>
 
@@ -1732,6 +1756,8 @@
     <module>apacheds-configuration</module>
     <module>apacheds-configuration-feature</module>
     <module>apacheds-configuration-help</module>
+    <module>test-integration-core</module>
+    <module>test-integration-ui</module>
     <module>jars</module>
     <module>updatesite</module>
     <module>studio</module>

Modified: directory/studio/trunk/repository/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/pom.xml?rev=664548&r1=664547&r2=664548&view=diff
==============================================================================
--- directory/studio/trunk/repository/pom.xml (original)
+++ directory/studio/trunk/repository/pom.xml Sun Jun  8 13:18:14 2008
@@ -66,6 +66,16 @@
     </dependency>
 
     <!-- Eclipse RCP artifacts -->
+
+    <dependency>
+      <groupId>net.sf.swtbot.eclipse</groupId>
+      <artifactId>finder</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.swtbot</groupId>
+      <artifactId>finder</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>com.ibm</groupId>
       <artifactId>icu</artifactId>



Mime
View raw message