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 2011/04/27 01:20:18 UTC
svn commit: r1096956 - in /geronimo/server/trunk/framework:
assemblies/geronimo-framework/ configs/rmi-naming/src/main/plan/
configs/server-security-config/src/main/plan/ features/
features/j2ee-system/ features/server-security-config/ features/server-...
Author: djencks
Date: Tue Apr 26 23:20:17 2011
New Revision: 1096956
URL: http://svn.apache.org/viewvc?rev=1096956&view=rev
Log:
Add a kar for security config files. Hardcode rmi server variables until substitution is implemented. GBeans now all start
Added:
geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/
geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/
geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/
geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/demo_groups.properties (contents, props changed)
- copied, changed from r1096955, geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/demo_groups.properties
geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/demo_users.properties (contents, props changed)
- copied, changed from r1096955, geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/demo_users.properties
geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/groups.properties (contents, props changed)
- copied, changed from r1096955, geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/groups.properties
geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/keystores/
geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/keystores/geronimo-default
geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/users.properties (contents, props changed)
- copied, changed from r1096955, geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/users.properties
Removed:
geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/demo_groups.properties
geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/demo_users.properties
geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/groups.properties
geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/users.properties
Modified:
geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml
geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml
geronimo/server/trunk/framework/configs/server-security-config/src/main/plan/plan.xml
geronimo/server/trunk/framework/features/j2ee-system/pom.xml
geronimo/server/trunk/framework/features/pom.xml
geronimo/server/trunk/framework/features/server-security-config/pom.xml
geronimo/server/trunk/framework/features/server-security-config/src/main/history/dependencies.xml
Modified: geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml?rev=1096956&r1=1096955&r2=1096956&view=diff
==============================================================================
--- geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml Tue Apr 26 23:20:17 2011
@@ -71,6 +71,13 @@
<classifier>features</classifier>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework.feature</groupId>
+ <artifactId>server-security-config</artifactId>
+ <version>${project.version}</version>
+ <type>kar</type>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<build>
@@ -190,6 +197,7 @@
<feature>jndi</feature>
<feature>obr</feature>
<feature>j2ee-system</feature>
+ <feature>server-security-config</feature>
</bootFeatures>
</configuration>
</plugin>
Modified: geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml?rev=1096956&r1=1096955&r2=1096956&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml Tue Apr 26 23:20:17 2011
@@ -23,8 +23,8 @@
<gbean name="WaitForBlueprint" class="org.apache.geronimo.blueprint.WaitForBlueprintGBean"/>
<gbean name="RMIRegistry" class="org.apache.geronimo.kernel.rmi.RMIRegistryService">
- <attribute name="port">${planNamingPort}</attribute>
- <attribute name="host">${ServerHostname}</attribute>
+ <attribute name="port">1099</attribute>
+ <attribute name="host">localhost</attribute>
<attribute name="classLoaderSpi">org.apache.geronimo.kernel.rmi.RMIClassLoaderSpiImpl</attribute>
</gbean>
Modified: geronimo/server/trunk/framework/configs/server-security-config/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/server-security-config/src/main/plan/plan.xml?rev=1096956&r1=1096955&r2=1096956&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/server-security-config/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/server-security-config/src/main/plan/plan.xml Tue Apr 26 23:20:17 2011
@@ -28,8 +28,8 @@
class="org.apache.geronimo.security.jaas.LoginModuleGBean">
<attribute name="loginModuleClass">org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</attribute>
<attribute name="options">
- usersURI=var/security/users.properties
- groupsURI=var/security/groups.properties
+ usersURI=etc/security/users.properties
+ groupsURI=etc/security/groups.properties
</attribute>
<attribute name="loginDomainName">geronimo-admin</attribute>
</gbean>
@@ -53,7 +53,7 @@
<gbean name="geronimo-default" class="org.apache.geronimo.security.keystore.FileKeystoreInstance">
<attribute name="keystoreName">geronimo-default</attribute>
- <attribute name="keystorePath">var/security/keystores/geronimo-default</attribute>
+ <attribute name="keystorePath">etc/security/keystores/geronimo-default</attribute>
<attribute name="keystorePassword">secret</attribute>
<attribute name="keystoreType">JKS</attribute>
<attribute name="keyPasswords">geronimo=secret</attribute>
Modified: geronimo/server/trunk/framework/features/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/j2ee-system/pom.xml?rev=1096956&r1=1096955&r2=1096956&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/framework/features/j2ee-system/pom.xml Tue Apr 26 23:20:17 2011
@@ -201,12 +201,12 @@
<version>${project.version}</version>
<type>car</type>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework.config</groupId>
- <artifactId>server-security-config</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.framework.config</groupId>-->
+ <!--<artifactId>server-security-config</artifactId>-->
+ <!--<version>${project.version}</version>-->
+ <!--<type>car</type>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.framework.config</groupId>
<artifactId>plugin</artifactId>
Modified: geronimo/server/trunk/framework/features/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/pom.xml?rev=1096956&r1=1096955&r2=1096956&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/pom.xml (original)
+++ geronimo/server/trunk/framework/features/pom.xml Tue Apr 26 23:20:17 2011
@@ -46,7 +46,7 @@
<!--<module>online-deployer</module>-->
<!--<module>rmi-naming</module>-->
<!--<module>plugin</module>-->
- <!--<module>server-security-config</module>-->
+ <module>server-security-config</module>
<!--<module>shutdown</module>-->
<!--<module>jmx-security</module>-->
<!--<module>karaf-framework</module>-->
Modified: geronimo/server/trunk/framework/features/server-security-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/server-security-config/pom.xml?rev=1096956&r1=1096955&r2=1096956&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/server-security-config/pom.xml (original)
+++ geronimo/server/trunk/framework/features/server-security-config/pom.xml Tue Apr 26 23:20:17 2011
@@ -39,38 +39,34 @@
<!-- parent -->
<dependency>
<groupId>org.apache.geronimo.framework.feature</groupId>
- <artifactId>j2ee-security</artifactId>
+ <artifactId>j2ee-system</artifactId>
<version>${project.version}</version>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-security</artifactId>
+ <groupId>org.apache.geronimo.framework.config</groupId>
+ <artifactId>server-security-config</artifactId>
<version>${project.version}</version>
+ <type>car</type>
</dependency>
</dependencies>
-<!--
<build>
<plugins>
<plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>car-maven-plugin</artifactId>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
<configuration>
- <deploymentConfigs>
- <deploymentConfig>${gbeanDeployer}</deploymentConfig>
- </deploymentConfigs>
- <category>Security</category>
- <instance>
- <plugin-artifact>
- <copy-file relative-to="server" dest-dir="var/security">security/</copy-file>
- </plugin-artifact>
- </instance>
+ <startLevel>50</startLevel>
+ <checkDependencyChange>true</checkDependencyChange>
+ <warnOnDependencyChange>true</warnOnDependencyChange>
+ <logDependencyChanges>true</logDependencyChanges>
+ <!--<overwriteChangedDependencies>true</overwriteChangedDependencies>-->
+ <!--<aggregateFeatures>true</aggregateFeatures>-->
</configuration>
</plugin>
</plugins>
</build>
--->
</project>
Modified: geronimo/server/trunk/framework/features/server-security-config/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/server-security-config/src/main/history/dependencies.xml?rev=1096956&r1=1096955&r2=1096956&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/server-security-config/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/features/server-security-config/src/main/history/dependencies.xml Tue Apr 26 23:20:17 2011
@@ -1,14 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
- <module-id>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>server-security-config</artifactId>
- <version>3.0-SNAPSHOT</version>
- <type>car</type>
- </module-id>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>j2ee-security</artifactId>
- <type>car</type>
- </dependency>
-</plugin-artifact>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="server-security-config">
+ <feature>
+ <feature>j2ee-system</feature>
+ <bundle>mvn:org.apache.geronimo.framework.config/server-security-config/3.0-SNAPSHOT/car</bundle>
+ </feature>
+</features>
Copied: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/demo_groups.properties (from r1096955, geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/demo_groups.properties)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/demo_groups.properties?p2=geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/demo_groups.properties&p1=geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/demo_groups.properties&r1=1096955&r2=1096956&rev=1096956&view=diff
==============================================================================
(empty)
Propchange: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/demo_groups.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/demo_groups.properties
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/demo_groups.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/demo_users.properties (from r1096955, geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/demo_users.properties)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/demo_users.properties?p2=geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/demo_users.properties&p1=geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/demo_users.properties&r1=1096955&r2=1096956&rev=1096956&view=diff
==============================================================================
(empty)
Propchange: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/demo_users.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/demo_users.properties
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/demo_users.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/groups.properties (from r1096955, geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/groups.properties)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/groups.properties?p2=geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/groups.properties&p1=geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/groups.properties&r1=1096955&r2=1096956&rev=1096956&view=diff
==============================================================================
(empty)
Propchange: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/groups.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/groups.properties
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/groups.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/keystores/geronimo-default
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/keystores/geronimo-default?rev=1096956&view=auto
==============================================================================
Files geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/keystores/geronimo-default (added) and geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/keystores/geronimo-default Tue Apr 26 23:20:17 2011 differ
Copied: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/users.properties (from r1096955, geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/users.properties)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/users.properties?p2=geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/users.properties&p1=geronimo/server/trunk/framework/features/server-security-config/src/main/resources/security/users.properties&r1=1096955&r2=1096956&rev=1096956&view=diff
==============================================================================
(empty)
Propchange: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/users.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/users.properties
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/framework/features/server-security-config/src/main/resources/resources/etc/security/users.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain