Author: dreedy
Date: Thu Sep 3 19:27:22 2015
New Revision: 1701112
URL: http://svn.apache.org/r1701112
Log:
Working towards release, adding groovy-config.jar support
Added:
river/jtsk/skunk/qa-refactor-namespace/trunk/dep-libs/groovy/
river/jtsk/skunk/qa-refactor-namespace/trunk/dep-libs/groovy/groovy-all-2.3.8.jar
(with props)
river/jtsk/skunk/qa-refactor-namespace/trunk/poms/groovy-config.pom
river/jtsk/skunk/qa-refactor-namespace/trunk/poms/install_river.groovy
(with props)
river/jtsk/skunk/qa-refactor-namespace/trunk/src/manifest/groovy-config/
river/jtsk/skunk/qa-refactor-namespace/trunk/src/manifest/groovy-config/META-INF/
river/jtsk/skunk/qa-refactor-namespace/trunk/src/manifest/groovy-config/META-INF/services/
river/jtsk/skunk/qa-refactor-namespace/trunk/src/manifest/groovy-config/META-INF/services/net.jini.config.Configuration
river/jtsk/skunk/qa-refactor-namespace/trunk/src/net/jini/config/Component.groovy
Removed:
river/jtsk/skunk/qa-refactor-namespace/trunk/src/org/apache/river/config/Component.java
Modified:
river/jtsk/skunk/qa-refactor-namespace/trunk/build.xml
river/jtsk/skunk/qa-refactor-namespace/trunk/common.xml
river/jtsk/skunk/qa-refactor-namespace/trunk/poms/deploy_river.groovy
river/jtsk/skunk/qa-refactor-namespace/trunk/poms/fiddler-dl.pom
river/jtsk/skunk/qa-refactor-namespace/trunk/poms/fiddler.pom
river/jtsk/skunk/qa-refactor-namespace/trunk/poms/jsk-dl.pom
river/jtsk/skunk/qa-refactor-namespace/trunk/poms/jsk-lib.pom
river/jtsk/skunk/qa-refactor-namespace/trunk/poms/jsk-platform.pom
river/jtsk/skunk/qa-refactor-namespace/trunk/poms/jsk-resources.pom
river/jtsk/skunk/qa-refactor-namespace/trunk/poms/mahalo-dl.pom
river/jtsk/skunk/qa-refactor-namespace/trunk/poms/mahalo.pom
river/jtsk/skunk/qa-refactor-namespace/trunk/poms/mercury-dl.pom
river/jtsk/skunk/qa-refactor-namespace/trunk/poms/mercury.pom
river/jtsk/skunk/qa-refactor-namespace/trunk/poms/norm-dl.pom
river/jtsk/skunk/qa-refactor-namespace/trunk/poms/norm.pom
river/jtsk/skunk/qa-refactor-namespace/trunk/poms/outrigger-dl.pom
river/jtsk/skunk/qa-refactor-namespace/trunk/poms/outrigger.pom
river/jtsk/skunk/qa-refactor-namespace/trunk/poms/reggie-dl.pom
river/jtsk/skunk/qa-refactor-namespace/trunk/poms/reggie.pom
river/jtsk/skunk/qa-refactor-namespace/trunk/poms/serviceui.pom
river/jtsk/skunk/qa-refactor-namespace/trunk/poms/start.pom
Modified: river/jtsk/skunk/qa-refactor-namespace/trunk/build.xml
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/qa-refactor-namespace/trunk/build.xml?rev=1701112&r1=1701111&r2=1701112&view=diff
==============================================================================
--- river/jtsk/skunk/qa-refactor-namespace/trunk/build.xml (original)
+++ river/jtsk/skunk/qa-refactor-namespace/trunk/build.xml Thu Sep 3 19:27:22
2015
@@ -312,6 +312,9 @@
<classpath refid="javadoc.classpath" />
<sourcepath refid="javadoc.sourcepath" />
+ <configuration>
+ <additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
<fileset dir="${src.dir}"
includes="org/apache/river/mahalo/MahaloPermission.java"/>
<package name="org.apache.river.admin"/>
@@ -416,6 +419,9 @@
<bottom><![CDATA[${api.copyright}]]></bottom>
<classpath refid="javadoc.classpath" />
<sourcepath refid="javadoc.sourcepath" />
+ <configuration>
+ <additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
</javadoc>
<mkdir dir="${doc.internals.dir}/doc-files"/>
<copy file="NOTICE"
tofile="${doc.internals.dir}/doc-files/NOTICE.txt"/>
@@ -443,6 +449,9 @@
description="ignore"/>
<classpath refid="javadoc.classpath"/>
<sourcepath refid="javadoc.sourcepath" />
+ <configuration>
+ <additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
<package name="net.jini.activation"/>
<package name="net.jini.config"/>
@@ -490,6 +499,7 @@
toolswrappers.jars,
services.jars,
extra.jar,
+ groovy-config.jar,
browser.jars" />
<target name="river.jars" depends="stubs,
@@ -542,8 +552,8 @@
<javac-cmd source.dir="${src.dir}" dest.dir="${build.classes.dir}">
<classpath refid="compile.classpath" />
</javac-cmd>
- </target>
-
+ </target>
+
<target name="copy-extlibs" >
<copy todir="lib">
<fileset refid="asm.jars"/>
@@ -711,6 +721,22 @@
</jar>
</target>
+ <target name="groovy-config.jar">
+ <delete file="${lib.dir}/groovy-config.jar" quiet="true"/>
+ <groovyc srcdir="src" destdir="${build.classes.dir}"
listfiles="yes">
+ <classpath refid="river.classes"/>
+ <include name="**/*.groovy"/>
+ </groovyc>
+ <jar destfile="${lib.dir}/groovy-config.jar" index="false">
+ <fileset dir="${build.classes.dir}">
+ <include name="net/jini/config/GroovyConfig**"/>
+ <include name="net/jini/config/Component**"/>
+ </fileset>
+ <fileset dir="${src.manifest.dir}/groovy-config"
+
includes="META-INF/services/net.jini.config.Configuration"/>
+ </jar>
+ </target>
+
<target name="extra.jar" depends="compile" >
<!-- hooks for extra.jar build (RIVER-359) -->
@@ -857,6 +883,8 @@
<arg line="-in org.apache.river"/>
<arg line="-out net.jini.lookup"/>
<arg line="-out org.apache.river.api.lookup"/>
+ <arg line="-out net.jini.config.GroovyConfig"/>
+ <arg line="-out net.jini.config.Component"/>
<arg path="${build.classes.dir}/net/jini/activation"/>
<arg path="${build.classes.dir}/net/jini/config"/>
<arg path="${build.classes.dir}/net/jini/constraint"/>
Modified: river/jtsk/skunk/qa-refactor-namespace/trunk/common.xml
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/qa-refactor-namespace/trunk/common.xml?rev=1701112&r1=1701111&r2=1701112&view=diff
==============================================================================
--- river/jtsk/skunk/qa-refactor-namespace/trunk/common.xml (original)
+++ river/jtsk/skunk/qa-refactor-namespace/trunk/common.xml Thu Sep 3 19:27:22
2015
@@ -142,6 +142,14 @@
<include name="asm-commons-5.0.1.jar" />
</fileset>
+ <path id="groovy.jars">
+ <fileset dir="${root}/dep-libs/groovy" includes="**/*.jar" />
+ </path>
+
+ <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc">
+ <classpath refid="groovy.jars"/>
+ </taskdef>
+
<fileset id="velocity.jars" dir="${root}/dep-libs/velocity">
<include name="velocity-1.7.jar" />
</fileset>
Added:
river/jtsk/skunk/qa-refactor-namespace/trunk/dep-libs/groovy/groovy-all-2.3.8.jar
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/qa-refactor-namespace/trunk/dep-libs/groovy/groovy-all-2.3.8.jar?rev=1701112&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
river/jtsk/skunk/qa-refactor-namespace/trunk/dep-libs/groovy/groovy-all-2.3.8.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: river/jtsk/skunk/qa-refactor-namespace/trunk/poms/deploy_river.groovy
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/qa-refactor-namespace/trunk/poms/deploy_river.groovy?rev=1701112&r1=1701111&r2=1701112&view=diff
==============================================================================
--- river/jtsk/skunk/qa-refactor-namespace/trunk/poms/deploy_river.groovy
(original)
+++ river/jtsk/skunk/qa-refactor-namespace/trunk/poms/deploy_river.groovy Thu
Sep 3 19:27:22 2015
@@ -54,4 +54,78 @@ String rootDir = ".."
process.consumeProcessOutputStream(System.out)
process.consumeProcessErrorStream(System.err)
process.waitFor()
-}
\ No newline at end of file
+}
+
+#!/usr/bin/env groovy
+/*
+ * Copyright to the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+String version = "3.0
+String rootDir = ".."
+String repositoryId="apache.releases.https"
+String
repositoryURL="https://repository.apache.org/service/local/staging/deploy/maven2";
+//String repositoryURL="file:///Users/trasukg/mvn-repo"
+String passphrase="Insert passphrase here..."
+
+["net.jini:jsk-platform":"lib",
+ "net.jini:jsk-lib":"lib",
+ "net.jini:jsk-dl":"lib-dl",
+ "net.jini:jsk-resources":"lib",
+ "net.jini:jsk-policy":"lib-ext",
+ "net.jini.lookup:serviceui":"lib",
+ "org.apache.river:fiddler":"lib",
+ "org.apache.river:fiddler-dl":"lib-dl",
+ "org.apache.river:mahalo":"lib",
+ "org.apache.river:mahalo-dl":"lib-dl",
+ "org.apache.river:mercury":"lib",
+ "org.apache.river:mercury-dl":"lib-dl",
+ "org.apache.river:norm":"lib",
+ "org.apache.river:norm-dl":"lib-dl",
+ "org.apache.river:outrigger":"lib",
+ "org.apache.river:outrigger-dl":"lib-dl",
+ "org.apache.river:reggie":"lib",
+ "org.apache.river:reggie-dl":"lib-dl",
+ "org.apache.river:start":"lib"
+ "org.apache.river:tools":"lib"
+].each {artifact, subDir ->
+
+ String[] parts = artifact.split(":")
+ String gId = parts[0]
+ String aId = parts[1]
+ String dir = rootDir+"/"+subDir
+
+ def deployCommand = [\
+"mvn",
+"gpg:sign-and-deploy-file",
+"-DpomFile=${aId}.pom",
+"-Dfile=${dir}/${aId}.jar",
+"-DrepositoryId=${repositoryId}",
+"-Durl=${repositoryURL}",
+"-Dgpg.useAgent=false",
+"[email protected]",
+"-Dgpg.passphrase=${passphrase}"]
+
+ /* First make sure the jar file contains the LICENSE file */
+ def p="jar uvf ${dir}/${aId}.jar -C .. LICENSE".execute()
+ p.consumeProcessOutputStream(System.out)
+ p.consumeProcessErrorStream(System.err)
+ p.waitFor()
+
+ println deployCommand
+ Process process = deployCommand.execute()
+ process.consumeProcessOutputStream(System.out)
+ process.consumeProcessErrorStream(System.err)
+ process.waitFor()
+}
Modified: river/jtsk/skunk/qa-refactor-namespace/trunk/poms/fiddler-dl.pom
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/qa-refactor-namespace/trunk/poms/fiddler-dl.pom?rev=1701112&r1=1701111&r2=1701112&view=diff
==============================================================================
--- river/jtsk/skunk/qa-refactor-namespace/trunk/poms/fiddler-dl.pom (original)
+++ river/jtsk/skunk/qa-refactor-namespace/trunk/poms/fiddler-dl.pom Thu Sep 3
19:27:22 2015
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.river</groupId>
<artifactId>fiddler-dl</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
<url>http://river.apache.org</url>
<description>Fiddler service client download jar</description>
@@ -40,7 +40,7 @@
<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-dl</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
</dependency>
</dependencies>
Modified: river/jtsk/skunk/qa-refactor-namespace/trunk/poms/fiddler.pom
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/qa-refactor-namespace/trunk/poms/fiddler.pom?rev=1701112&r1=1701111&r2=1701112&view=diff
==============================================================================
--- river/jtsk/skunk/qa-refactor-namespace/trunk/poms/fiddler.pom (original)
+++ river/jtsk/skunk/qa-refactor-namespace/trunk/poms/fiddler.pom Thu Sep 3
19:27:22 2015
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.river</groupId>
<artifactId>fiddler</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
<url>http://river.apache.org</url>
<description> Fiddler implementation of the lookup discovery
service</description>
@@ -40,7 +40,7 @@
<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-lib</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
</dependency>
</dependencies>
Added: river/jtsk/skunk/qa-refactor-namespace/trunk/poms/groovy-config.pom
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/qa-refactor-namespace/trunk/poms/groovy-config.pom?rev=1701112&view=auto
==============================================================================
--- river/jtsk/skunk/qa-refactor-namespace/trunk/poms/groovy-config.pom (added)
+++ river/jtsk/skunk/qa-refactor-namespace/trunk/poms/groovy-config.pom Thu Sep
3 19:27:22 2015
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright (C) 2013 the original author or authors.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY 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";>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>net.jini</groupId>
+ <artifactId>groovy-config</artifactId>
+ <version>3.0</version>
+ <url>http://river.apache.org</url>
+ <description>Provides sypport gor using Groovy as a configuration provider
+ </description>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+
+ <dependencies>
+ <dependency>
+ <groupId>net.jini</groupId>
+ <artifactId>jsk-platform</artifactId>
+ <version>3.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>2.3.8</version>
+ </dependency>
+ </dependencies>
+
+</project>
Added: river/jtsk/skunk/qa-refactor-namespace/trunk/poms/install_river.groovy
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/qa-refactor-namespace/trunk/poms/install_river.groovy?rev=1701112&view=auto
==============================================================================
--- river/jtsk/skunk/qa-refactor-namespace/trunk/poms/install_river.groovy
(added)
+++ river/jtsk/skunk/qa-refactor-namespace/trunk/poms/install_river.groovy Thu
Sep 3 19:27:22 2015
@@ -0,0 +1,56 @@
+#!/usr/bin/env groovy
+/*
+ * Copyright to the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+String version = "3.0"
+String rootDir = ".."
+
+["net.jini:jsk-platform":"lib",
+ "net.jini:jsk-lib":"lib",
+ "net.jini:jsk-dl":"lib-dl",
+ "net.jini:jsk-resources":"lib",
+ "net.jini:groovy-config":"lib",
+ "net.jini.lookup:serviceui":"lib",
+ "org.apache.river:fiddler":"lib",
+ "org.apache.river:fiddler-dl":"lib-dl",
+ "org.apache.river:mahalo":"lib",
+ "org.apache.river:mahalo-dl":"lib-dl",
+ "org.apache.river:mercury":"lib",
+ "org.apache.river:mercury-dl":"lib-dl",
+ "org.apache.river:norm":"lib",
+ "org.apache.river:norm-dl":"lib-dl",
+ "org.apache.river:outrigger":"lib",
+ "org.apache.river:outrigger-dl":"lib-dl",
+ "org.apache.river:reggie":"lib",
+ "org.apache.river:reggie-dl":"lib-dl",
+ "org.apache.river:start":"lib"].each {artifact, subDir ->
+
+ String[] parts = artifact.split(":")
+ String gId = parts[0]
+ String aId = parts[1]
+ String dir = rootDir+"/"+subDir
+ String installCommand = "mvn install:install-file "+
+ "-Dversion=${version} "+
+ "-Dpackaging=jar "+
+ "-DgroupId=${gId} "+
+ "-DartifactId=${aId} "+
+ "-Dfile=${dir}/${aId}.jar "+
+ "-DpomFile=./${aId}.pom "
+ println installCommand
+ Process process = installCommand.execute()
+ process.consumeProcessOutputStream(System.out)
+ process.consumeProcessErrorStream(System.err)
+ process.waitFor()
+}
\ No newline at end of file
Propchange:
river/jtsk/skunk/qa-refactor-namespace/trunk/poms/install_river.groovy
------------------------------------------------------------------------------
svn:executable = *
Modified: river/jtsk/skunk/qa-refactor-namespace/trunk/poms/jsk-dl.pom
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/qa-refactor-namespace/trunk/poms/jsk-dl.pom?rev=1701112&r1=1701111&r2=1701112&view=diff
==============================================================================
--- river/jtsk/skunk/qa-refactor-namespace/trunk/poms/jsk-dl.pom (original)
+++ river/jtsk/skunk/qa-refactor-namespace/trunk/poms/jsk-dl.pom Thu Sep 3
19:27:22 2015
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.jini</groupId>
<artifactId>jsk-dl</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
<url>http://river.apache.org</url>
<description>This artifact is the client download (codebase) jar for
jsk-lib.</description>
Modified: river/jtsk/skunk/qa-refactor-namespace/trunk/poms/jsk-lib.pom
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/qa-refactor-namespace/trunk/poms/jsk-lib.pom?rev=1701112&r1=1701111&r2=1701112&view=diff
==============================================================================
--- river/jtsk/skunk/qa-refactor-namespace/trunk/poms/jsk-lib.pom (original)
+++ river/jtsk/skunk/qa-refactor-namespace/trunk/poms/jsk-lib.pom Thu Sep 3
19:27:22 2015
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.jini</groupId>
<artifactId>jsk-lib</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
<url>http://river.apache.org</url>
<description>This artifact contains the River utility APIs that are not
tied to a specific service implementation.</description>
@@ -40,7 +40,7 @@
<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-platform</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
</dependency>
</dependencies>
Modified: river/jtsk/skunk/qa-refactor-namespace/trunk/poms/jsk-platform.pom
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/qa-refactor-namespace/trunk/poms/jsk-platform.pom?rev=1701112&r1=1701111&r2=1701112&view=diff
==============================================================================
--- river/jtsk/skunk/qa-refactor-namespace/trunk/poms/jsk-platform.pom
(original)
+++ river/jtsk/skunk/qa-refactor-namespace/trunk/poms/jsk-platform.pom Thu Sep
3 19:27:22 2015
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.jini</groupId>
<artifactId>jsk-platform</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
<url>http://river.apache.org</url>
<description>Configures specific service providers to be used, such as
PreferredClassProvider, trust and integrity verifiers, and
DiscoveryFormatProvider
@@ -42,8 +42,15 @@
<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-resources</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
</dependency>
+
+ <dependency>
+ <groupId>com.boundary</groupId>
+ <artifactId>high-scale-lib</artifactId>
+ <version>1.0.6</version>
+ </dependency>
+
</dependencies>
</project>
Modified: river/jtsk/skunk/qa-refactor-namespace/trunk/poms/jsk-resources.pom
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/qa-refactor-namespace/trunk/poms/jsk-resources.pom?rev=1701112&r1=1701111&r2=1701112&view=diff
==============================================================================
--- river/jtsk/skunk/qa-refactor-namespace/trunk/poms/jsk-resources.pom
(original)
+++ river/jtsk/skunk/qa-refactor-namespace/trunk/poms/jsk-resources.pom Thu Sep
3 19:27:22 2015
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.jini</groupId>
<artifactId>jsk-resources</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
<url>http://river.apache.org</url>
<description></description>
Modified: river/jtsk/skunk/qa-refactor-namespace/trunk/poms/mahalo-dl.pom
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/qa-refactor-namespace/trunk/poms/mahalo-dl.pom?rev=1701112&r1=1701111&r2=1701112&view=diff
==============================================================================
--- river/jtsk/skunk/qa-refactor-namespace/trunk/poms/mahalo-dl.pom (original)
+++ river/jtsk/skunk/qa-refactor-namespace/trunk/poms/mahalo-dl.pom Thu Sep 3
19:27:22 2015
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.river</groupId>
<artifactId>mahalo-dl</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
<url>http://river.apache.org</url>
<description>Mahalo Transaction Manager service client download
jar</description>
@@ -40,7 +40,7 @@
<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-dl</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
</dependency>
</dependencies>
Modified: river/jtsk/skunk/qa-refactor-namespace/trunk/poms/mahalo.pom
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/qa-refactor-namespace/trunk/poms/mahalo.pom?rev=1701112&r1=1701111&r2=1701112&view=diff
==============================================================================
--- river/jtsk/skunk/qa-refactor-namespace/trunk/poms/mahalo.pom (original)
+++ river/jtsk/skunk/qa-refactor-namespace/trunk/poms/mahalo.pom Thu Sep 3
19:27:22 2015
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.river</groupId>
<artifactId>mahalo</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
<url>http://river.apache.org</url>
<description>Mahalo Transaction Manager service
implementation</description>
@@ -40,7 +40,7 @@
<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-lib</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
</dependency>
</dependencies>
Modified: river/jtsk/skunk/qa-refactor-namespace/trunk/poms/mercury-dl.pom
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/qa-refactor-namespace/trunk/poms/mercury-dl.pom?rev=1701112&r1=1701111&r2=1701112&view=diff
==============================================================================
--- river/jtsk/skunk/qa-refactor-namespace/trunk/poms/mercury-dl.pom (original)
+++ river/jtsk/skunk/qa-refactor-namespace/trunk/poms/mercury-dl.pom Thu Sep 3
19:27:22 2015
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.river</groupId>
<artifactId>mercury-dl</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
<url>http://river.apache.org</url>
<description>Event mailbox service client download jar</description>
@@ -40,7 +40,7 @@
<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-dl</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
</dependency>
</dependencies>
Modified: river/jtsk/skunk/qa-refactor-namespace/trunk/poms/mercury.pom
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/qa-refactor-namespace/trunk/poms/mercury.pom?rev=1701112&r1=1701111&r2=1701112&view=diff
==============================================================================
--- river/jtsk/skunk/qa-refactor-namespace/trunk/poms/mercury.pom (original)
+++ river/jtsk/skunk/qa-refactor-namespace/trunk/poms/mercury.pom Thu Sep 3
19:27:22 2015
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.river</groupId>
<artifactId>mercury</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
<url>http://river.apache.org</url>
<description>Event mailbox service implementation</description>
@@ -40,7 +40,7 @@
<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-lib</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
</dependency>
</dependencies>
Modified: river/jtsk/skunk/qa-refactor-namespace/trunk/poms/norm-dl.pom
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/qa-refactor-namespace/trunk/poms/norm-dl.pom?rev=1701112&r1=1701111&r2=1701112&view=diff
==============================================================================
--- river/jtsk/skunk/qa-refactor-namespace/trunk/poms/norm-dl.pom (original)
+++ river/jtsk/skunk/qa-refactor-namespace/trunk/poms/norm-dl.pom Thu Sep 3
19:27:22 2015
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.river</groupId>
<artifactId>norm-dl</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
<url>http://river.apache.org</url>
<description>Norm service client download jar</description>
@@ -40,7 +40,7 @@
<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-dl</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
</dependency>
</dependencies>
Modified: river/jtsk/skunk/qa-refactor-namespace/trunk/poms/norm.pom
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/qa-refactor-namespace/trunk/poms/norm.pom?rev=1701112&r1=1701111&r2=1701112&view=diff
==============================================================================
--- river/jtsk/skunk/qa-refactor-namespace/trunk/poms/norm.pom (original)
+++ river/jtsk/skunk/qa-refactor-namespace/trunk/poms/norm.pom Thu Sep 3
19:27:22 2015
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.river</groupId>
<artifactId>norm</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
<url>http://river.apache.org</url>
<description>Norm implementation of the lease renewal service</description>
@@ -40,7 +40,7 @@
<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-lib</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
</dependency>
</dependencies>
Modified: river/jtsk/skunk/qa-refactor-namespace/trunk/poms/outrigger-dl.pom
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/qa-refactor-namespace/trunk/poms/outrigger-dl.pom?rev=1701112&r1=1701111&r2=1701112&view=diff
==============================================================================
--- river/jtsk/skunk/qa-refactor-namespace/trunk/poms/outrigger-dl.pom
(original)
+++ river/jtsk/skunk/qa-refactor-namespace/trunk/poms/outrigger-dl.pom Thu Sep
3 19:27:22 2015
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.river</groupId>
<artifactId>outrigger-dl</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
<url>http://river.apache.org</url>
<description>Outrigger JavaSpace service client download jar</description>
@@ -40,7 +40,7 @@
<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-dl</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
</dependency>
</dependencies>
Modified: river/jtsk/skunk/qa-refactor-namespace/trunk/poms/outrigger.pom
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/qa-refactor-namespace/trunk/poms/outrigger.pom?rev=1701112&r1=1701111&r2=1701112&view=diff
==============================================================================
--- river/jtsk/skunk/qa-refactor-namespace/trunk/poms/outrigger.pom (original)
+++ river/jtsk/skunk/qa-refactor-namespace/trunk/poms/outrigger.pom Thu Sep 3
19:27:22 2015
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.river</groupId>
<artifactId>outrigger</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
<url>http://river.apache.org</url>
<description>Outrigger JavaSpace service implementation</description>
@@ -40,7 +40,7 @@
<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-lib</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
</dependency>
</dependencies>
Modified: river/jtsk/skunk/qa-refactor-namespace/trunk/poms/reggie-dl.pom
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/qa-refactor-namespace/trunk/poms/reggie-dl.pom?rev=1701112&r1=1701111&r2=1701112&view=diff
==============================================================================
--- river/jtsk/skunk/qa-refactor-namespace/trunk/poms/reggie-dl.pom (original)
+++ river/jtsk/skunk/qa-refactor-namespace/trunk/poms/reggie-dl.pom Thu Sep 3
19:27:22 2015
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.river</groupId>
<artifactId>reggie-dl</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
<url>http://river.apache.org</url>
<description>River Lookup and Registry service client download
jar</description>
@@ -40,7 +40,7 @@
<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-dl</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
</dependency>
</dependencies>
Modified: river/jtsk/skunk/qa-refactor-namespace/trunk/poms/reggie.pom
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/qa-refactor-namespace/trunk/poms/reggie.pom?rev=1701112&r1=1701111&r2=1701112&view=diff
==============================================================================
--- river/jtsk/skunk/qa-refactor-namespace/trunk/poms/reggie.pom (original)
+++ river/jtsk/skunk/qa-refactor-namespace/trunk/poms/reggie.pom Thu Sep 3
19:27:22 2015
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.river</groupId>
<artifactId>reggie</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
<url>http://river.apache.org</url>
<description>River Lookup and Registry service implementation</description>
@@ -40,7 +40,7 @@
<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-lib</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
</dependency>
</dependencies>
Modified: river/jtsk/skunk/qa-refactor-namespace/trunk/poms/serviceui.pom
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/qa-refactor-namespace/trunk/poms/serviceui.pom?rev=1701112&r1=1701111&r2=1701112&view=diff
==============================================================================
--- river/jtsk/skunk/qa-refactor-namespace/trunk/poms/serviceui.pom (original)
+++ river/jtsk/skunk/qa-refactor-namespace/trunk/poms/serviceui.pom Thu Sep 3
19:27:22 2015
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.jini.lookup</groupId>
<artifactId>serviceui</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
<url>http://river.apache.org</url>
<description>Service UI attributes and factories</description>
Modified: river/jtsk/skunk/qa-refactor-namespace/trunk/poms/start.pom
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/qa-refactor-namespace/trunk/poms/start.pom?rev=1701112&r1=1701111&r2=1701112&view=diff
==============================================================================
--- river/jtsk/skunk/qa-refactor-namespace/trunk/poms/start.pom (original)
+++ river/jtsk/skunk/qa-refactor-namespace/trunk/poms/start.pom Thu Sep 3
19:27:22 2015
@@ -25,7 +25,7 @@
It acts as both the class path for the container virtual machine (VM) for
the Java platform
that executes non-activatable services, and as the setup VM for
activatable services.
</description>
- <version>2.2.1</version>
+ <version>3.0</version>
<licenses>
<license>
@@ -38,7 +38,7 @@
<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-platform</artifactId>
- <version>2.2.1</version>
+ <version>3.0</version>
</dependency>
</dependencies>
Added:
river/jtsk/skunk/qa-refactor-namespace/trunk/src/manifest/groovy-config/META-INF/services/net.jini.config.Configuration
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/qa-refactor-namespace/trunk/src/manifest/groovy-config/META-INF/services/net.jini.config.Configuration?rev=1701112&view=auto
==============================================================================
---
river/jtsk/skunk/qa-refactor-namespace/trunk/src/manifest/groovy-config/META-INF/services/net.jini.config.Configuration
(added)
+++
river/jtsk/skunk/qa-refactor-namespace/trunk/src/manifest/groovy-config/META-INF/services/net.jini.config.Configuration
Thu Sep 3 19:27:22 2015
@@ -0,0 +1,19 @@
+#/*
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#*/
+
+net.jini.config.GroovyConfig
\ No newline at end of file
Added:
river/jtsk/skunk/qa-refactor-namespace/trunk/src/net/jini/config/Component.groovy
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/qa-refactor-namespace/trunk/src/net/jini/config/Component.groovy?rev=1701112&view=auto
==============================================================================
---
river/jtsk/skunk/qa-refactor-namespace/trunk/src/net/jini/config/Component.groovy
(added)
+++
river/jtsk/skunk/qa-refactor-namespace/trunk/src/net/jini/config/Component.groovy
Thu Sep 3 19:27:22 2015
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package net.jini.config;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * The Component annotation is used in a Groovy class to indicate what
+ * configuration component the class is to be used for.
+ *
+ * <p>The component identifies the object whose behavior will be configured
+ * using the object returned. The value of component must be a
+ * <i>QualifiedIdentifier</i>, as defined in the
+ * <i>Java(TM) Language Specification (JLS)</i>, and is typically the class or
+ * package name of the object being configured.
+ *
+ * @author Dennis Reedy
+ */
+@Documented
+@Retention (RetentionPolicy.RUNTIME)
+@Target (value= ElementType.TYPE)
+public @interface Component {
+ String value();
+}
