You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by gt...@apache.org on 2015/01/09 22:22:17 UTC
svn commit: r1650672 - in /river/river-examples/river-examples/trunk: ./
browser/ browser/src/main/java/org/apache/river/examples/browser/ home/
home/src/assembly/ home/src/main/home/ src/site/markdown/
Author: gtrasuk
Date: Fri Jan 9 21:22:16 2015
New Revision: 1650672
URL: http://svn.apache.org/r1650672
Log:
Examples no longer use the newer river-rt-tools project. Examples are complete up to getting the infrastructure services running. Work is started on the hello-service example.
Modified:
river/river-examples/river-examples/trunk/browser/pom.xml
river/river-examples/river-examples/trunk/browser/src/main/java/org/apache/river/examples/browser/Browser.java
river/river-examples/river-examples/trunk/home/pom.xml
river/river-examples/river-examples/trunk/home/src/assembly/home.xml
river/river-examples/river-examples/trunk/home/src/main/home/start-browser.config
river/river-examples/river-examples/trunk/pom.xml
river/river-examples/river-examples/trunk/src/site/markdown/index.md
Modified: river/river-examples/river-examples/trunk/browser/pom.xml
URL: http://svn.apache.org/viewvc/river/river-examples/river-examples/trunk/browser/pom.xml?rev=1650672&r1=1650671&r2=1650672&view=diff
==============================================================================
--- river/river-examples/river-examples/trunk/browser/pom.xml (original)
+++ river/river-examples/river-examples/trunk/browser/pom.xml Fri Jan 9 21:22:16 2015
@@ -37,9 +37,9 @@
<artifactId>outrigger-dl</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.river.tools.rt</groupId>
+ <groupId>org.apache.river</groupId>
<artifactId>start</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.2.2</version>
</dependency>
</dependencies>
@@ -53,6 +53,10 @@
<archive>
<manifest>
<addClasspath>true</addClasspath>
+ <classpathLayoutType>custom</classpathLayoutType>
+ <customClasspathLayout>
+ ${artifact.artifactId}.${artifact.extension}
+ </customClasspathLayout>
<mainClass>org.apache.river.examples.browser.Browser</mainClass>
</manifest>
</archive>
Modified: river/river-examples/river-examples/trunk/browser/src/main/java/org/apache/river/examples/browser/Browser.java
URL: http://svn.apache.org/viewvc/river/river-examples/river-examples/trunk/browser/src/main/java/org/apache/river/examples/browser/Browser.java?rev=1650672&r1=1650671&r2=1650672&view=diff
==============================================================================
--- river/river-examples/river-examples/trunk/browser/src/main/java/org/apache/river/examples/browser/Browser.java (original)
+++ river/river-examples/river-examples/trunk/browser/src/main/java/org/apache/river/examples/browser/Browser.java Fri Jan 9 21:22:16 2015
@@ -22,7 +22,7 @@ import com.sun.jini.config.Config;
import com.sun.jini.logging.Levels;
import com.sun.jini.outrigger.JavaSpaceAdmin;
import com.sun.jini.proxy.BasicProxyTrustVerifier;
-import org.apache.river.tools.rt.start.LifeCycle;
+import com.sun.jini.start.LifeCycle;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.event.ActionEvent;
Modified: river/river-examples/river-examples/trunk/home/pom.xml
URL: http://svn.apache.org/viewvc/river/river-examples/river-examples/trunk/home/pom.xml?rev=1650672&r1=1650671&r2=1650672&view=diff
==============================================================================
--- river/river-examples/river-examples/trunk/home/pom.xml (original)
+++ river/river-examples/river-examples/trunk/home/pom.xml Fri Jan 9 21:22:16 2015
@@ -18,14 +18,24 @@
<artifactId>browser</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
+
<dependency>
- <groupId>org.apache.river.tools.rt</groupId>
- <artifactId>start</artifactId>
+ <groupId>org.apache.river.examples</groupId>
+ <artifactId>hello-api</artifactId>
<version>1.0-SNAPSHOT</version>
- </dependency>
+ </dependency>
+
<!-- Note that the version ids for the following are in the
dependency-management block on the parent pom!. -->
<dependency>
+ <groupId>org.apache.river</groupId>
+ <artifactId>start</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.river</groupId>
+ <artifactId>tools</artifactId>
+ </dependency>
+ <dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-platform</artifactId>
</dependency>
@@ -41,6 +51,15 @@
<groupId>net.jini</groupId>
<artifactId>jsk-resources</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.river</groupId>
+ <artifactId>reggie</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.river</groupId>
+ <artifactId>reggie-dl</artifactId>
+ </dependency>
+
</dependencies>
<build>
<plugins>
Modified: river/river-examples/river-examples/trunk/home/src/assembly/home.xml
URL: http://svn.apache.org/viewvc/river/river-examples/river-examples/trunk/home/src/assembly/home.xml?rev=1650672&r1=1650671&r2=1650672&view=diff
==============================================================================
--- river/river-examples/river-examples/trunk/home/src/assembly/home.xml (original)
+++ river/river-examples/river-examples/trunk/home/src/assembly/home.xml Fri Jan 9 21:22:16 2015
@@ -24,7 +24,6 @@
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
-
<fileSets>
<fileSet>
<outputDirectory>/</outputDirectory>
@@ -69,6 +68,7 @@
<exclude>*:maven-*</exclude>
<exclude>*:plexus-*</exclude>
</excludes>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
</dependencySet>
<dependencySet>
@@ -78,6 +78,7 @@
<include>*:*-dl</include>
<include>*:*-api</include>
</includes>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
</dependencySet>
</dependencySets>
Modified: river/river-examples/river-examples/trunk/home/src/main/home/start-browser.config
URL: http://svn.apache.org/viewvc/river/river-examples/river-examples/trunk/home/src/main/home/start-browser.config?rev=1650672&r1=1650671&r2=1650672&view=diff
==============================================================================
--- river/river-examples/river-examples/trunk/home/src/main/home/start-browser.config (original)
+++ river/river-examples/river-examples/trunk/home/src/main/home/start-browser.config Fri Jan 9 21:22:16 2015
@@ -19,20 +19,21 @@
/* Configuration file for starting non-secure Browser */
import com.sun.jini.config.ConfigUtil;
-import org.apache.river.tools.rt.start.NonActivatableServiceDescriptor;
-import org.apache.river.tools.rt.start.ServiceDescriptor;
+import com.sun.jini.start.NonActivatableServiceDescriptor;
+import com.sun.jini.start.ServiceDescriptor;
-org.apache.river.tools.rt.start {
+com.sun.jini.start {
private static policy = "server.policy";
- private static classpath = "lib${/}browser-${version}.jar";
+ private static classpath = "lib${/}browser.jar";
private static config = "browser.config";
+ private static codebase = "";
static serviceDescriptors = new ServiceDescriptor[] {
new NonActivatableServiceDescriptor(
- "", policy, classpath,
+ codebase, policy, classpath,
"org.apache.river.examples.browser.Browser",
new String[] { config })
};
-}//org.apache.river.tools.rt.start
+}//com.sun.jini.start
Modified: river/river-examples/river-examples/trunk/pom.xml
URL: http://svn.apache.org/viewvc/river/river-examples/river-examples/trunk/pom.xml?rev=1650672&r1=1650671&r2=1650672&view=diff
==============================================================================
--- river/river-examples/river-examples/trunk/pom.xml (original)
+++ river/river-examples/river-examples/trunk/pom.xml Fri Jan 9 21:22:16 2015
@@ -75,9 +75,14 @@
<version>${jsk.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.river.tools.rt</groupId>
+ <groupId>org.apache.river</groupId>
<artifactId>start</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.river</groupId>
+ <artifactId>tools</artifactId>
+ <version>2.2.2</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -122,5 +127,6 @@
<modules>
<module>browser</module>
<module>home</module>
+ <module>hello-api</module>
</modules>
</project>
\ No newline at end of file
Modified: river/river-examples/river-examples/trunk/src/site/markdown/index.md
URL: http://svn.apache.org/viewvc/river/river-examples/river-examples/trunk/src/site/markdown/index.md?rev=1650672&r1=1650671&r2=1650672&view=diff
==============================================================================
--- river/river-examples/river-examples/trunk/src/site/markdown/index.md (original)
+++ river/river-examples/river-examples/trunk/src/site/markdown/index.md Fri Jan 9 21:22:16 2015
@@ -21,3 +21,50 @@ Apache River Examples
=====================
This project contains a set of examples that show how to use Apache River.
+
+## Building the examples
+
+The project uses Apache Maven to manage the dependencies and build the examples.
+There is no need to download and build the main River distribution or tools;
+the River artifacts are deployed to Maven Central, so Maven will automatically
+download the binary artifacts as needed for the examples build.
+
+You'll need Apache Maven installed. See [Apache Maven](http://maven.apache.org).
+
+To build the examples, simply unpack the source distribution of 'river-examples',
+and then,
+
+ cd river-examples
+ mvn install
+ mvn site
+
+The first time you run the build, Maven will go out to Maven Central and
+retrieve the River binary artifacts, storing them in your local Maven cache
+(see Maven's documentation for more information).
+
+## Service Browser
+
+This is a utility that allows you to browse the services that are
+operating in your workgroup, or 'djinn'. Although it's presented as an example,
+you'll find it to be a useful utility, as well.
+
+The example illustrates a basic use of the ServiceStarter utility class to
+setup the environment for the browser to run in, including the installation of
+a DynamicPolicyProvider and custom classloader.
+
+[Read More...](browser/browser.html)
+
+##Infrastructure Services
+
+A set of services and clients that are interoperating using Jini is called a
+'workgroup' or sometimes a 'djinn'.
+
+These services and clients need some basic infrastructure available to them. There needs
+to be a service registrar in order for clients to find services. Clients may want to
+use a transaction manager. They may want to use messaging intermediaries, and so on.
+
+All these supporting functions are implemented by River's infrastructure services.
+Because services are run by the service starter,...
+
+[Read More...](infrastructure/infrastructure.html)
+