isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1331316 - in /incubator/isis/branches/0.3.0-incubating-NEW-OIDs: core/testsupport/ runtimes/ runtimes/dflt/objectstores/sql/sql-tests-common/ runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objec...
Date Fri, 27 Apr 2012 09:23:05 GMT
Author: danhaywood
Date: Fri Apr 27 09:23:04 2012
New Revision: 1331316

URL: http://svn.apache.org/viewvc?rev=1331316&view=rev
Log:
ISIS-214: code compiles in branch (-DskipTests, though)

Removed:
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/testsystem/dataclasses/
Modified:
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/testsupport/pom.xml
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-tests-common/pom.xml
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/testsupport/pom.xml
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/pom.xml
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/viewer/dnd/pom.xml
    incubator/isis/branches/0.3.0-incubating-NEW-OIDs/viewer/html/pom.xml

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/testsupport/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/testsupport/pom.xml?rev=1331316&r1=1331315&r2=1331316&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/testsupport/pom.xml (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/core/testsupport/pom.xml Fri Apr 27
09:23:04 2012
@@ -69,25 +69,25 @@
     </reporting>
 
 	<dependencies>
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-            </dependency>
-
-            <dependency>
-                <groupId>org.jmock</groupId>
-                <artifactId>jmock</artifactId>
-            </dependency>
-
-            <dependency>
-                <groupId>org.jmock</groupId>
-                <artifactId>jmock-junit4</artifactId>
-            </dependency>
-
-            <dependency>
-                <groupId>org.jmock</groupId>
-                <artifactId>jmock-legacy</artifactId>
-            </dependency>
+           <dependency>
+               <groupId>junit</groupId>
+               <artifactId>junit</artifactId>
+           </dependency>
+
+           <dependency>
+               <groupId>org.jmock</groupId>
+               <artifactId>jmock</artifactId>
+           </dependency>
+
+           <dependency>
+               <groupId>org.jmock</groupId>
+               <artifactId>jmock-junit4</artifactId>
+           </dependency>
+
+           <dependency>
+               <groupId>org.jmock</groupId>
+               <artifactId>jmock-legacy</artifactId>
+           </dependency>
 
 	</dependencies>
 

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-tests-common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-tests-common/pom.xml?rev=1331316&r1=1331315&r2=1331316&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-tests-common/pom.xml
(original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/objectstores/sql/sql-tests-common/pom.xml
Fri Apr 27 09:23:04 2012
@@ -103,13 +103,17 @@
         <dependency>
             <groupId>org.apache.isis.core</groupId>
             <artifactId>testsupport</artifactId>
-            <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.isis.runtimes.dflt</groupId>
             <artifactId>runtime</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.isis.runtimes.dflt</groupId>
+            <artifactId>testsupport</artifactId>
+        </dependency>
         
         <!--  Required for TestProxy -->
 		<!-- Isis defaults -->
@@ -124,11 +128,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.isis.runtimes.dflt</groupId>
-            <artifactId>testsupport</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
         	<groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
         	<artifactId>dflt</artifactId>
             <scope>test</scope>

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/testsupport/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/testsupport/pom.xml?rev=1331316&r1=1331315&r2=1331316&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/testsupport/pom.xml (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/dflt/testsupport/pom.xml Fri
Apr 27 09:23:04 2012
@@ -70,6 +70,26 @@
         </dependency>
 
         <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jmock</groupId>
+            <artifactId>jmock</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jmock</groupId>
+            <artifactId>jmock-junit4</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jmock</groupId>
+            <artifactId>jmock-legacy</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.isis.tck</groupId>
             <artifactId>tck-dom</artifactId>
             <version>0.3.0-incubating-SNAPSHOT</version>

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/pom.xml?rev=1331316&r1=1331315&r2=1331316&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/pom.xml (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/runtimes/pom.xml Fri Apr 27 09:23:04
2012
@@ -46,7 +46,6 @@
 
 	<modules>
 		<module>dflt</module>
-		<module>embedded</module>
 	</modules>
 
 	<reporting>

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/viewer/dnd/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/viewer/dnd/pom.xml?rev=1331316&r1=1331315&r2=1331316&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/viewer/dnd/pom.xml (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/viewer/dnd/pom.xml Fri Apr 27 09:23:04
2012
@@ -116,6 +116,7 @@
         <dependency>
             <groupId>org.apache.isis.runtimes.dflt</groupId>
             <artifactId>testsupport</artifactId>
+            <version>0.3.0-incubating-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 

Modified: incubator/isis/branches/0.3.0-incubating-NEW-OIDs/viewer/html/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.3.0-incubating-NEW-OIDs/viewer/html/pom.xml?rev=1331316&r1=1331315&r2=1331316&view=diff
==============================================================================
--- incubator/isis/branches/0.3.0-incubating-NEW-OIDs/viewer/html/pom.xml (original)
+++ incubator/isis/branches/0.3.0-incubating-NEW-OIDs/viewer/html/pom.xml Fri Apr 27 09:23:04
2012
@@ -132,6 +132,7 @@
         <dependency>
             <groupId>org.apache.isis.runtimes.dflt</groupId>
             <artifactId>testsupport</artifactId>
+            <version>0.3.0-incubating-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 



Mime
View raw message