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/10/18 20:21:58 UTC
svn commit: r1185782 - in /incubator/isis/trunk/framework: modules msdf.sh
pom.xml viewer/json/json-applib/pom.xml
Author: kevin
Date: Tue Oct 18 18:21:57 2011
New Revision: 1185782
URL: http://svn.apache.org/viewvc?rev=1185782&view=rev
Log:
ISIS-125: Fix to repository lines (pom.xml). Renamed modules (modules). Dry run, preparing for next release.
Modified:
incubator/isis/trunk/framework/modules
incubator/isis/trunk/framework/msdf.sh
incubator/isis/trunk/framework/pom.xml
incubator/isis/trunk/framework/viewer/json/json-applib/pom.xml
Modified: incubator/isis/trunk/framework/modules
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/modules?rev=1185782&r1=1185781&r2=1185782&view=diff
==============================================================================
--- incubator/isis/trunk/framework/modules (original)
+++ incubator/isis/trunk/framework/modules Tue Oct 18 18:21:57 2011
@@ -29,8 +29,8 @@ progmodels/groovy/applib/:leaf
progmodels/groovy/metamodel/:leaf
progmodels/groovy/:
progmodels/wrapper/:
-progmodels/wrapper/applib/:leaf
-progmodels/wrapper/metamodel/:leaf
+progmodels/wrapper/wrapper-applib/:leaf
+progmodels/wrapper/wrapper-metamodel/:leaf
runtimes/:
runtimes/dflt/:
runtimes/dflt/bytecode/:
@@ -42,9 +42,9 @@ runtimes/dflt/objectstores/:
runtimes/dflt/objectstores/dflt/:leaf
runtimes/dflt/objectstores/nosql/:leaf
runtimes/dflt/objectstores/sql/:
-runtimes/dflt/objectstores/sql/impl/:leaf
-runtimes/dflt/objectstores/sql/tests-common/:leaf
-runtimes/dflt/objectstores/sql/tests-served/:leaf
+runtimes/dflt/objectstores/sql/sql-impl/:leaf
+runtimes/dflt/objectstores/sql/sql-tests-common/:leaf
+runtimes/dflt/objectstores/sql/sql-tests-served/:leaf
runtimes/dflt/objectstores/xml/:leaf
runtimes/dflt/profilestores/:
runtimes/dflt/profilestores/dflt/:leaf
@@ -55,8 +55,8 @@ runtimes/dflt/remoting/marshalling-encod
runtimes/dflt/remoting/marshalling-serialize/:leaf
runtimes/dflt/remoting/marshalling-xstream/:leaf
runtimes/dflt/remoting/transport-http/:
-runtimes/dflt/remoting/transport-http/client/:leaf
-runtimes/dflt/remoting/transport-http/server/:leaf
+runtimes/dflt/remoting/transport-http/transport-http-client/:leaf
+runtimes/dflt/remoting/transport-http/transport-http-server/:leaf
runtimes/dflt/remoting/transport-sockets/:leaf
runtimes/dflt/runtime/:leaf
runtimes/dflt/webapp/:leaf
@@ -74,17 +74,17 @@ viewer/dnd/:leaf
viewer/html/:leaf
viewer/junit/:leaf
viewer/json/:
-viewer/json/applib/:leaf
-viewer/json/viewer/:leaf
+viewer/json/json-applib/:leaf
+viewer/json/json-viewer/:leaf
viewer/scimpi/:
-viewer/scimpi/dispatcher/:leaf
-viewer/scimpi/servlet/:leaf
+viewer/scimpi/scimpi-dispatcher/:leaf
+viewer/scimpi/scimpi-servlet/:leaf
viewer/wicket/:
-viewer/wicket/applib/:leaf
-viewer/wicket/metamodel/:leaf
-viewer/wicket/model/:leaf
-viewer/wicket/ui/:leaf
-viewer/wicket/viewer/:leaf
+viewer/wicket/wicket-applib/:leaf
+viewer/wicket/wicket-metamodel/:leaf
+viewer/wicket/wicket-model/:leaf
+viewer/wicket/wicket-ui/:leaf
+viewer/wicket/wicket-viewer/:leaf
viewer/xhtml/:
-viewer/xhtml/applib/:leaf
-viewer/xhtml/viewer/:leaf
+viewer/xhtml/xhtml-applib/:leaf
+viewer/xhtml/xhtml-viewer/:leaf
Modified: incubator/isis/trunk/framework/msdf.sh
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/msdf.sh?rev=1185782&r1=1185781&r2=1185782&view=diff
==============================================================================
--- incubator/isis/trunk/framework/msdf.sh (original)
+++ incubator/isis/trunk/framework/msdf.sh Tue Oct 18 18:21:57 2011
@@ -26,7 +26,7 @@ do
cd $d
pwd
echo mvn clean site-deploy -D modules=site -D deploy=local -D patch=$n $*
- mvn clean site-deploy -D modules=site -D deploy=local -D patch=$n $*
+ mvn3 -T 4 clean site-deploy -D modules=site -D deploy=local -D patch=$n $*
cd $root
fi
done
Modified: incubator/isis/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/pom.xml?rev=1185782&r1=1185781&r2=1185782&view=diff
==============================================================================
--- incubator/isis/trunk/framework/pom.xml (original)
+++ incubator/isis/trunk/framework/pom.xml Tue Oct 18 18:21:57 2011
@@ -186,17 +186,42 @@
<pluginRepository>
<id>Codehaus Repository</id>
<url>http://repository.codehaus.org/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</pluginRepository>
</pluginRepositories>
<repositories>
+<!--
+ <repository>
+ <id>Maven Repository</id>
+ <url>http://repo1.maven.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+-->
+ <repository>
+ <id>Apache Repository</id>
+ <url>https://repository.apache.org/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
<repository>
<id>Maven Central Repository (UK Mirror)</id>
<url>http://uk.maven.org/maven2</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
<repository>
<id>JBoss Public Release</id>
<url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
</repositories>
@@ -231,7 +256,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0</version>
+ <version>1.0-beta-1</version>
<configuration>
<rules>
<requireMavenVersion>
@@ -528,6 +553,7 @@
<plugin>
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId>
+ <!-- <version>2.0.13</version> -->
<version>2.0.8</version>
<!-- doesn't seem to render the title page correctly?
<version>2.0.10</version> -->
Modified: incubator/isis/trunk/framework/viewer/json/json-applib/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/pom.xml?rev=1185782&r1=1185781&r2=1185782&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/pom.xml Tue Oct 18 18:21:57 2011
@@ -89,7 +89,7 @@
<!-- The artifact in the maven repository has been moved and causes a build failure. Using this setting gets the artifact allowing the build to work. This fix should hopefully be temporary -->
<repository>
<id>java.net</id>
- <url>http://download.java.net/maven/1</url>
+ <url>http://repo1.maven.org/maven2</url>
<snapshots>
<enabled>false</enabled>
</snapshots>