river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtra...@apache.org
Subject [24/40] git commit: "transient-mahalo" module now starts up transaction manager, which is then visible in the browser client.
Date Mon, 13 Jan 2014 03:35:31 GMT
"transient-mahalo" module now starts up transaction manager, which is then visible in the browser
client.

Project: http://git-wip-us.apache.org/repos/asf/river-container/repo
Commit: http://git-wip-us.apache.org/repos/asf/river-container/commit/42f2ef2a
Tree: http://git-wip-us.apache.org/repos/asf/river-container/tree/42f2ef2a
Diff: http://git-wip-us.apache.org/repos/asf/river-container/diff/42f2ef2a

Branch: refs/heads/master
Commit: 42f2ef2a97ab92bb81f4151e8d41700e48797bd7
Parents: e8ab8bc
Author: Greg Trasuk <gtrasuk@apache.org>
Authored: Mon Nov 25 03:39:30 2013 -0500
Committer: Greg Trasuk <gtrasuk@apache.org>
Committed: Mon Nov 25 03:39:30 2013 -0500

----------------------------------------------------------------------
 .../org/apache/river/container/core-config.xml       |  2 +-
 test-container/src/main/root/bin/logging.properties  |  4 ++--
 .../main/root/profile/default/service-starter.cfg    |  7 +++++++
 transient-mahalo-module/pom.xml                      |  4 ++--
 transient-mahalo-module/src/assemble/module.xml      |  9 ++++++++-
 transient-mahalo-module/src/main/root/mahalo.config  | 15 +++++++++++++++
 6 files changed, 35 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/river-container/blob/42f2ef2a/river-container-core/src/main/resources/org/apache/river/container/core-config.xml
----------------------------------------------------------------------
diff --git a/river-container-core/src/main/resources/org/apache/river/container/core-config.xml
b/river-container-core/src/main/resources/org/apache/river/container/core-config.xml
index 8133ba5..6ce4ee4 100644
--- a/river-container-core/src/main/resources/org/apache/river/container/core-config.xml
+++ b/river-container-core/src/main/resources/org/apache/river/container/core-config.xml
@@ -45,7 +45,7 @@
     hence was available in the "extensions" loader.  Here, we'd prefer not to 
     require any changes to the JSDK installation directory.
     -->
-    <cfg:classpath id="systemClassLoader">lib/jsk-policy-2.2.1.jar</cfg:classpath>
+    <cfg:classpath id="systemClassLoader">lib/jsk-policy-${jsk-version}.jar</cfg:classpath>
     <cfg:classpath id="containerClassLoader" parent="systemClassLoader">
         lib/river-container-core-1.0-SNAPSHOT.jar
         lib/commons-logging-1.1.1.jar

http://git-wip-us.apache.org/repos/asf/river-container/blob/42f2ef2a/test-container/src/main/root/bin/logging.properties
----------------------------------------------------------------------
diff --git a/test-container/src/main/root/bin/logging.properties b/test-container/src/main/root/bin/logging.properties
index 62fab38..731b763 100644
--- a/test-container/src/main/root/bin/logging.properties
+++ b/test-container/src/main/root/bin/logging.properties
@@ -50,12 +50,12 @@ java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
 # Provides extra control for each logger.
 ############################################################
 
-org.apache.river.container.level = FINER
+org.apache.river.container.level = INFO
 
 org.apache.river.container.ShowContextToConsole.level=INFO
 
 net.jini.config.level=INFO
 org.apache.river.container.security.ContainerCodePolicy.level=INFO
 org.apache.river.container.deployer.ClasspathFilterBuilder.level=INFO
-org.apache.river.container.deployer.DeployerConfigParser=INFO
+org.apache.river.container.deployer.DeployerConfigParser.level=INFO
 net.jini.config.level=INFO

http://git-wip-us.apache.org/repos/asf/river-container/blob/42f2ef2a/test-container/src/main/root/profile/default/service-starter.cfg
----------------------------------------------------------------------
diff --git a/test-container/src/main/root/profile/default/service-starter.cfg b/test-container/src/main/root/profile/default/service-starter.cfg
index dff12ce..0c1a044 100644
--- a/test-container/src/main/root/profile/default/service-starter.cfg
+++ b/test-container/src/main/root/profile/default/service-starter.cfg
@@ -52,6 +52,13 @@ grant {
     java.lang.RuntimePermission "shutdownHooks";
     java.util.PropertyPermission "*" "read";
 
+    // BasicProxyPreparer requirements:
+    javax.security.auth.AuthPermission "getSubject";
+    // Should not be required once UmbrellaGrantPolicy is implemented.
+    // TODO: Config file parser doesn't recognize \"
+    net.jini.security.GrantPermission "delim=| java.lang.RuntimePermission |accessClassInPackage.com.sun.proxy|";
+
+    /* Required for using dynamic proxies. */
     java.lang.RuntimePermission "accessClassInPackage.com.sun.proxy";
 }
 

http://git-wip-us.apache.org/repos/asf/river-container/blob/42f2ef2a/transient-mahalo-module/pom.xml
----------------------------------------------------------------------
diff --git a/transient-mahalo-module/pom.xml b/transient-mahalo-module/pom.xml
index 06a0af5..da2f5f7 100644
--- a/transient-mahalo-module/pom.xml
+++ b/transient-mahalo-module/pom.xml
@@ -33,14 +33,14 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.river</groupId>
-            <artifactId>reggie</artifactId>
+            <artifactId>mahalo</artifactId>
             <version>${jsk-version}</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.river</groupId>
-            <artifactId>reggie-dl</artifactId>
+            <artifactId>mahalo-dl</artifactId>
             <version>${jsk-version}</version>
             <scope>compile</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/river-container/blob/42f2ef2a/transient-mahalo-module/src/assemble/module.xml
----------------------------------------------------------------------
diff --git a/transient-mahalo-module/src/assemble/module.xml b/transient-mahalo-module/src/assemble/module.xml
index 3776c7e..0965573 100644
--- a/transient-mahalo-module/src/assemble/module.xml
+++ b/transient-mahalo-module/src/assemble/module.xml
@@ -44,7 +44,10 @@
         <dependencySet>
             <useProjectArtifact>false</useProjectArtifact>
             <outputDirectory>/lib</outputDirectory>
-            
+            <!-- jsk jars are already provided by the container. -->
+            <excludes>
+                <exclude>*:jsk-*</exclude>
+            </excludes>
         </dependencySet>
         
         <dependencySet>
@@ -53,6 +56,10 @@
             <includes>
                 <include>*:*-dl</include>
             </includes>
+            <!-- jsk jars are already provided by the container. -->
+            <excludes>
+                <exclude>*:jsk-*</exclude>
+            </excludes>
         </dependencySet>
     </dependencySets>
 

http://git-wip-us.apache.org/repos/asf/river-container/blob/42f2ef2a/transient-mahalo-module/src/main/root/mahalo.config
----------------------------------------------------------------------
diff --git a/transient-mahalo-module/src/main/root/mahalo.config b/transient-mahalo-module/src/main/root/mahalo.config
index 8db990e..76663f2 100644
--- a/transient-mahalo-module/src/main/root/mahalo.config
+++ b/transient-mahalo-module/src/main/root/mahalo.config
@@ -14,6 +14,8 @@ com.sun.jini.mahalo {
     serverExporter = new BasicJeriExporter(TcpServerEndpoint.getInstance(0),
                                      new BasicILFactory());
 
+    serviceInvocationConstraints=InvocationConstraints.EMPTY;
+        
     basicProxyPreparer =
         new BasicProxyPreparer(false, new BasicMethodConstraints(serviceInvocationConstraints),
             new Permission[] { new RuntimePermission("accessClassInPackage.com.sun.proxy")
} );
@@ -24,3 +26,16 @@ com.sun.jini.mahalo {
     recoveredLookupLocatorPreparer = basicProxyPreparer;
 
 }
+
+net.jini.lookup.JoinManager {
+    serviceInvocationConstraints=InvocationConstraints.EMPTY;
+        
+    basicProxyPreparer =
+        new BasicProxyPreparer(false, new BasicMethodConstraints(serviceInvocationConstraints),
+            new Permission[] { new RuntimePermission("accessClassInPackage.com.sun.proxy")
} );
+
+    registrarPreparer = basicProxyPreparer;
+    registrationPreparer = basicProxyPreparer;
+    serviceLeasePreparer = basicProxyPreparer;
+    
+}
\ No newline at end of file


Mime
View raw message