You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ke...@apache.org on 2011/07/23 14:28:08 UTC
svn commit: r1150094 - in /incubator/isis/trunk/framework: tck/ viewer/bdd/
viewer/bdd/concordion-tck/ viewer/dnd-tck/ viewer/html-tck/
viewer/json/json-tck/ viewer/junit-tck/ viewer/scimpi/scimpi-tck/
viewer/wicket/wicket-applib/ viewer/wicket/wicket-...
Author: kevin
Date: Sat Jul 23 12:28:06 2011
New Revision: 1150094
URL: http://svn.apache.org/viewvc?rev=1150094&view=rev
Log:
ISIS-107: TCK-viewer document directories were being created off isis/ . Edits are a kludge to force force matches, as per isis/viewer/scimpi/modules.html
Modified:
incubator/isis/trunk/framework/tck/pom.xml
incubator/isis/trunk/framework/viewer/bdd/concordion-tck/pom.xml
incubator/isis/trunk/framework/viewer/bdd/pom.xml
incubator/isis/trunk/framework/viewer/dnd-tck/pom.xml
incubator/isis/trunk/framework/viewer/html-tck/pom.xml
incubator/isis/trunk/framework/viewer/json/json-tck/pom.xml
incubator/isis/trunk/framework/viewer/junit-tck/pom.xml
incubator/isis/trunk/framework/viewer/scimpi/scimpi-tck/pom.xml
incubator/isis/trunk/framework/viewer/wicket/wicket-applib/pom.xml
incubator/isis/trunk/framework/viewer/wicket/wicket-tck/pom.xml
incubator/isis/trunk/framework/viewer/xhtml/xhtml-tck/pom.xml
incubator/isis/trunk/framework/viewer/xhtml/xhtml-viewer/pom.xml
Modified: incubator/isis/trunk/framework/tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/pom.xml?rev=1150094&r1=1150093&r2=1150094&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/pom.xml (original)
+++ incubator/isis/trunk/framework/tck/pom.xml Sat Jul 23 12:28:06 2011
@@ -516,7 +516,7 @@
</activation>
<!-- to deploy locally -->
<properties>
- <distMgmtSiteUrl>file:///tmp/m2-sites/isis</distMgmtSiteUrl>
+<!-- <distMgmtSiteUrl>file:///tmp/m2-sites/isis</distMgmtSiteUrl> -->
</properties>
</profile>
</profiles>
Modified: incubator/isis/trunk/framework/viewer/bdd/concordion-tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/concordion-tck/pom.xml?rev=1150094&r1=1150093&r2=1150094&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/concordion-tck/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/bdd/concordion-tck/pom.xml Sat Jul 23 12:28:06 2011
@@ -33,6 +33,10 @@
<properties>
<maven.test.skip>true</maven.test.skip>
+
+ <!-- until someone comes up with a better solution -->
+ <distMgmtSiteUrl>file:///tmp/m2-sites/isis/viewer/bdd</distMgmtSiteUrl>
+
</properties>
<build>
Modified: incubator/isis/trunk/framework/viewer/bdd/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/pom.xml?rev=1150094&r1=1150093&r2=1150094&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/bdd/pom.xml Sat Jul 23 12:28:06 2011
@@ -36,7 +36,7 @@
<properties>
<siteBaseDir>../..</siteBaseDir>
- <relativeUrl>viewer/bdd/</relativeUrl>
+ <relativeUrl>viewer/bdd/</relativeUrl>
<docbkxGuideTitle>Apache Isis BDD Testing Guide</docbkxGuideTitle>
<docbkxGuideSubTitle>Acceptance Testing using BDD Frameworks</docbkxGuideSubTitle>
Modified: incubator/isis/trunk/framework/viewer/dnd-tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd-tck/pom.xml?rev=1150094&r1=1150093&r2=1150094&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd-tck/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/dnd-tck/pom.xml Sat Jul 23 12:28:06 2011
@@ -35,6 +35,13 @@
<artifactId>dnd-tck</artifactId>
<name>Viewer DnD for TCK</name>
+ <properties>
+ <siteBaseDir>../../..</siteBaseDir>
+ <relativeUrl>viewer/dnd/dnd-tck/</relativeUrl>
+ <!-- until someone comes up with a better solution -->
+ <distMgmtSiteUrl>file:///tmp/m2-sites/isis/viewer/dnd</distMgmtSiteUrl>
+ </properties>
+
<build>
<plugins>
<!-- mvn package -->
Modified: incubator/isis/trunk/framework/viewer/html-tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html-tck/pom.xml?rev=1150094&r1=1150093&r2=1150094&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html-tck/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/html-tck/pom.xml Sat Jul 23 12:28:06 2011
@@ -29,6 +29,14 @@
<groupId>org.apache.isis.viewer</groupId>
<artifactId>html-tck</artifactId>
<name>HTML Viewer for TCK</name>
+
+ <properties>
+ <siteBaseDir>../../..</siteBaseDir>
+ <relativeUrl>viewer/html/html-tck/</relativeUrl>
+ <!-- until someone comes up with a better solution -->
+ <distMgmtSiteUrl>file:///tmp/m2-sites/isis/viewer/html</distMgmtSiteUrl>
+ </properties>
+
<packaging>war</packaging>
Modified: incubator/isis/trunk/framework/viewer/json/json-tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-tck/pom.xml?rev=1150094&r1=1150093&r2=1150094&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-tck/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/json/json-tck/pom.xml Sat Jul 23 12:28:06 2011
@@ -34,6 +34,10 @@
<properties>
<maven.test.skip>true</maven.test.skip>
+ <siteBaseDir>../../..</siteBaseDir>
+ <relativeUrl>viewer/json/json-tck/</relativeUrl>
+ <!-- until someone comes up with a better solution -->
+ <distMgmtSiteUrl>file:///tmp/m2-sites/isis/viewer/json</distMgmtSiteUrl>
</properties>
Modified: incubator/isis/trunk/framework/viewer/junit-tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/junit-tck/pom.xml?rev=1150094&r1=1150093&r2=1150094&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/junit-tck/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/junit-tck/pom.xml Sat Jul 23 12:28:06 2011
@@ -32,6 +32,10 @@
<properties>
<maven.test.skip>true</maven.test.skip>
+ <siteBaseDir>../../..</siteBaseDir>
+ <relativeUrl>viewer/junit/junit-tck/</relativeUrl>
+ <!-- until someone comes up with a better solution -->
+ <distMgmtSiteUrl>file:///tmp/m2-sites/isis/viewer/junit</distMgmtSiteUrl>
</properties>
<dependencies>
Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-tck/pom.xml?rev=1150094&r1=1150093&r2=1150094&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-tck/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-tck/pom.xml Sat Jul 23 12:28:06 2011
@@ -16,7 +16,8 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -29,6 +30,12 @@
<groupId>org.apache.isis.viewer</groupId>
<artifactId>scimpi-tck</artifactId>
<name>Scimpi Viewer for TCK</name>
+ <properties>
+ <siteBaseDir>../../..</siteBaseDir>
+ <relativeUrl>viewer/scimpi/scimpi-tck/</relativeUrl>
+ <!-- until someone comes up with a better solution -->
+ <distMgmtSiteUrl>file:///tmp/m2-sites/isis/viewer/scimpi</distMgmtSiteUrl>
+ </properties>
<packaging>war</packaging>
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-applib/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-applib/pom.xml?rev=1150094&r1=1150093&r2=1150094&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-applib/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-applib/pom.xml Sat Jul 23 12:28:06 2011
@@ -31,7 +31,7 @@
<properties>
<siteBaseDir>../../..</siteBaseDir>
- <relativeUrl>viewer/wicket/applib/</relativeUrl>
+ <relativeUrl>viewer/wicket/wicket-applib/</relativeUrl>
</properties>
<!-- used in Site generation for relative references. -->
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-tck/pom.xml?rev=1150094&r1=1150093&r2=1150094&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-tck/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-tck/pom.xml Sat Jul 23 12:28:06 2011
@@ -16,7 +16,8 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -26,16 +27,20 @@
<relativePath>../../../tck/pom.xml</relativePath>
</parent>
- <groupId>org.apache.isis.viewer</groupId>
- <name>Wicket Viewer for TCK</name>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>wicket-tck</artifactId>
-
- <packaging>war</packaging>
+ <name>Wicket Viewer for TCK</name>
<properties>
<jetty.version>6.1.4</jetty.version>
+ <siteBaseDir>../../..</siteBaseDir>
+ <relativeUrl>viewer/wicket/wicket-tck/</relativeUrl>
+ <!-- until someone comes up with a better solution -->
+ <distMgmtSiteUrl>file:///tmp/m2-sites/isis/viewer/wicket</distMgmtSiteUrl>
</properties>
+ <packaging>war</packaging>
+
<build>
<resources>
<resource>
Modified: incubator/isis/trunk/framework/viewer/xhtml/xhtml-tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/xhtml/xhtml-tck/pom.xml?rev=1150094&r1=1150093&r2=1150094&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/xhtml/xhtml-tck/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/xhtml/xhtml-tck/pom.xml Sat Jul 23 12:28:06 2011
@@ -16,7 +16,8 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -26,10 +27,18 @@
<relativePath>../../../tck/pom.xml</relativePath>
</parent>
- <groupId>org.apache.isis.viewer</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>xhtml-tck</artifactId>
<name>XHTML Viewer for TCK</name>
-
+
+ <properties>
+ <siteBaseDir>../../..</siteBaseDir>
+ <relativeUrl>viewer/xhtml/xhtml-tck/</relativeUrl>
+ <!-- until someone comes up with a better solution -->
+ <distMgmtSiteUrl>file:///tmp/m2-sites/isis/viewer/xhtml</distMgmtSiteUrl>
+ </properties>
+
+
<packaging>war</packaging>
<build>
Modified: incubator/isis/trunk/framework/viewer/xhtml/xhtml-viewer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/xhtml/xhtml-viewer/pom.xml?rev=1150094&r1=1150093&r2=1150094&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/xhtml/xhtml-viewer/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/xhtml/xhtml-viewer/pom.xml Sat Jul 23 12:28:06 2011
@@ -31,7 +31,7 @@
<properties>
<siteBaseDir>../../..</siteBaseDir>
- <relativeUrl>viewer/xhtml/viewer/</relativeUrl>
+ <relativeUrl>viewer/xhtml/xhtml-viewer/</relativeUrl>
</properties>
<!-- used in Site generation for relative references. -->