You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2012/01/13 23:27:14 UTC

svn commit: r1231351 [2/2] - in /geronimo/server/trunk: assemblies/geronimo-tomcat7-javaee6/ framework/features/ framework/features/client/ framework/features/client/src/ framework/features/client/src/main/ framework/features/client/src/main/feature/ f...

Added: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/users.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/users.properties?rev=1231351&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/users.properties (added)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/users.properties Fri Jan 13 22:27:13 2012
@@ -0,0 +1,30 @@
+################################################################################
+#
+#    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.
+#
+################################################################################
+
+#
+# This file contains the valid users who can log into Karaf. Each line has to be of
+# the format:
+#
+# USER=PASSWORD,ROLE1,ROLE2,...
+#
+# All users and roles entered in this file are available after Karaf startup
+# and modifiable via the JAAS command group. These users reside in a JAAS domain
+# with the name "karaf"..
+#
+karaf=karaf,admin

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/users.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/users.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/etc/users.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/instance.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/instance.properties?rev=1231351&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/instance.properties (added)
+++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/instance.properties Fri Jan 13 22:27:13 2012
@@ -0,0 +1,16 @@
+#Admin Service storage
+#Wed Jan 11 14:46:54 PST 2012
+rmi.server.port=44445
+rmi.registry.port=1100
+item.1.opts=
+item.1.name=root
+count=2
+item.1.pid=59910
+item.0.root=false
+item.1.loc=/Users/david/projects/geronimo-git/geronimo/assemblies/geronimo-tomcat7-javaee6/target/geronimo-tomcat7-javaee6-3.0-SNAPSHOT
+item.0.pid=0
+item.0.loc=/Users/david/projects/geronimo-git/geronimo/assemblies/geronimo-tomcat7-javaee6/target/geronimo-tomcat7-javaee6-3.0-SNAPSHOT/instances/client
+item.1.root=true
+item.0.opts=
+ssh.port=8102
+item.0.name=client

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/instance.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/instance.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/instance.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/framework/features/client/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/history/dependencies.xml?rev=1231351&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/client/src/main/history/dependencies.xml (added)
+++ geronimo/server/trunk/framework/features/client/src/main/history/dependencies.xml Fri Jan 13 22:27:13 2012
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="client">
+    <feature/>
+</features>

Propchange: geronimo/server/trunk/framework/features/client/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/client/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/client/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/framework/features/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/pom.xml?rev=1231351&r1=1231350&r2=1231351&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/pom.xml (original)
+++ geronimo/server/trunk/framework/features/pom.xml Fri Jan 13 22:27:13 2012
@@ -34,65 +34,11 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>declarative-services</module>
+        <!--<module>declarative-services</module>-->
         <module>framework</module>
+        <module>client</module>
         <module>org.apache.geronimo.javaee-specs</module>
         <module>org.apache.geronimo.jaxb-support</module>
     </modules>
 
-<!--
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                &lt;!&ndash; Install as extention to allow 'car' packaging to be used. &ndash;&gt;
-                <extensions>true</extensions>
-                <configuration>
-                    <systemProperties>
-                        <geronimo.build.car>true</geronimo.build.car>
-                    </systemProperties>
-                    <archive>
-                        &lt;!&ndash; Do not include META-INF/maven to avoid long file problems on windows &ndash;&gt;
-                        <addMavenDescriptor>false</addMavenDescriptor>
-                    </archive>
-                    <osiApproved>true</osiApproved>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                        <useTransitiveDependencies>true</useTransitiveDependencies>
-                    </useMavenDependencies>
-                    <warnOnDependencyChange>${warnOnDependencyChange}</warnOnDependencyChange>
-                    <logDependencyChanges>${logDependencyChanges}</logDependencyChanges>
-                    <overwriteChangedDependencies>${overwriteChangedDependencies}</overwriteChangedDependencies>
-                    <commonInstance>
-                        <plugin-artifact>
-                            <geronimo-version>${geronimoVersion}</geronimo-version>
-                            <jvm-version>1.6</jvm-version>
-                            &lt;!&ndash;<source-repository>http://www.geronimoplugins.com/repository/geronimo-2.1</source-repository>&ndash;&gt;
-                            <source-repository>${pluginSrcRepoLocal}</source-repository>
-                            <source-repository>${pluginSrcRepoCentral}</source-repository>
-                            <source-repository>${pluginSrcRepoApacheSnapshots}</source-repository>
-                            <artifact-alias key="${project.groupId}/${project.artifactId}//car">${project.groupId}/${project.artifactId}/${project.version}/car</artifact-alias>
-                        </plugin-artifact>
-                    </commonInstance>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
--->
-
-    <profiles>
-        <profile>
-            <id>all-subprojects</id>
-            <!-- use for things like versions:set and perhaps release when build has to run on all projects -->
-            <modules>
-                <module>geronimo-gbean-deployer/src/it/j2ee-system-it1</module>
-                <module>geronimo-gbean-deployer/src/it/j2ee-system-it2</module>
-                <module>geronimo-gbean-deployer/src/it/metadatageneration-it3</module>
-                <module>geronimo-gbean-deployer/src/it/metadatageneration-it4</module>
-            </modules>
-        </profile>
-    </profiles>
-
 </project>