[jboss-svn-commits] JBL Code SVN: r5148 - in labs/shotoku/trunk: . shotoku-admin/src/web shotoku-base/src/etc shotoku-svn/src/java/org/jboss/shotoku/svn shotoku-svn/src/java/org/jboss/shotoku/svn/service src/app/META-INF
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jul 18 14:07:00 EDT 2006
Author: adamw
Date: 2006-07-18 14:06:58 -0400 (Tue, 18 Jul 2006)
New Revision: 5148
Modified:
labs/shotoku/trunk/shotoku-admin/src/web/roles.properties
labs/shotoku/trunk/shotoku-base/src/etc/shotoku.properties.sample
labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnTools.java
labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/service/SvnRepository.java
labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/service/SvnServiceImpl.java
labs/shotoku/trunk/shotoku.iml
labs/shotoku/trunk/src/app/META-INF/jboss-service.xml
labs/shotoku/trunk/src/app/META-INF/login-config.xml
Log:
http://jira.jboss.org/jira/browse/JBLAB-631
Modified: labs/shotoku/trunk/shotoku-admin/src/web/roles.properties
===================================================================
--- labs/shotoku/trunk/shotoku-admin/src/web/roles.properties 2006-07-18 17:30:52 UTC (rev 5147)
+++ labs/shotoku/trunk/shotoku-admin/src/web/roles.properties 2006-07-18 18:06:58 UTC (rev 5148)
@@ -1,2 +1,3 @@
ShotokuAdmin=ShotokuAdmin
+CN\=localhost,\ OU\=MYOU,\ O\=MYORG,\ L\=MYCITY,\ ST\=MYSTATE,\ C\=MY=ShotokuAdmin
ShotokuUpdate=ShotokuUpdate
\ No newline at end of file
Modified: labs/shotoku/trunk/shotoku-base/src/etc/shotoku.properties.sample
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/etc/shotoku.properties.sample 2006-07-18 17:30:52 UTC (rev 5147)
+++ labs/shotoku/trunk/shotoku-base/src/etc/shotoku.properties.sample 2006-07-18 18:06:58 UTC (rev 5148)
@@ -10,6 +10,8 @@
shotoku.default.password =
shotoku.default.localpath =
shotoku.default.fullupdate = 1
+# Should externals be checked out during an update of the WC.
+shotoku.default.externals = 1
# shotoku.file.implementation = org.jboss.shotoku.files.FileContentManager
# shotoku.file.localpath =
Modified: labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnTools.java
===================================================================
--- labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnTools.java 2006-07-18 17:30:52 UTC (rev 5147)
+++ labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnTools.java 2006-07-18 18:06:58 UTC (rev 5148)
@@ -59,6 +59,7 @@
public static final String PROPERTY_PASSWORD = "password";
public static final String PROPERTY_LOCALPATH = "localpath";
public static final String PROPERTY_FULLUPDATE = "fullupdate";
+ public static final String PROPERTY_EXTERNALS = "externals";
/*
* Names of internal shotoku properties.
Modified: labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/service/SvnRepository.java
===================================================================
--- labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/service/SvnRepository.java 2006-07-18 17:30:52 UTC (rev 5147)
+++ labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/service/SvnRepository.java 2006-07-18 18:06:58 UTC (rev 5148)
@@ -74,6 +74,11 @@
*/
private int updateCounter;
+ /**
+ * Should externals be checked out during a WC update.
+ */
+ private boolean ignoreExternals;
+
private Set<Pair<Long, Set<String>>> toUpdate;
/**
@@ -87,7 +92,8 @@
private ContentManager cm;
public SvnRepository(String id, String username, String password,
- String url, String localpath, int fullUpdate) {
+ String url, String localpath, int fullUpdate,
+ boolean externals) {
log.info("Creating new Subversion Repository: id: "+id+
", username: "+username+
", passwd: "+password+
@@ -113,6 +119,7 @@
this.id = id;
this.fullUpdate = fullUpdate;
+ this.ignoreExternals = !externals;
updateCounter = 0;
wc = new File(localpath);
@@ -186,7 +193,7 @@
private void updateToUpdate() {
SVNUpdateClient updateClient = ourClientManager.getUpdateClient();
- updateClient.setIgnoreExternals(false);
+ updateClient.setIgnoreExternals(ignoreExternals);
for (Iterator<Pair<Long, Set<String>>> iter = toUpdate.iterator(); iter.hasNext();) {
Pair<Long, Set<String>> updateData = iter.next();
@@ -253,7 +260,7 @@
// Doing the actual update.
try {
SVNUpdateClient updateClient = ourClientManager.getUpdateClient();
- updateClient.setIgnoreExternals(false);
+ updateClient.setIgnoreExternals(ignoreExternals);
try {
/*
* Trying to do an update - if it does not succeed, then most
Modified: labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/service/SvnServiceImpl.java
===================================================================
--- labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/service/SvnServiceImpl.java 2006-07-18 17:30:52 UTC (rev 5147)
+++ labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/service/SvnServiceImpl.java 2006-07-18 18:06:58 UTC (rev 5148)
@@ -192,7 +192,8 @@
conf.getString(SvnTools.PROPERTY_PASSWORD),
conf.getString(SvnTools.PROPERTY_URL),
conf.getString(SvnTools.PROPERTY_LOCALPATH),
- conf.getInt(SvnTools.PROPERTY_FULLUPDATE, 1));
+ conf.getInt(SvnTools.PROPERTY_FULLUPDATE, 1),
+ conf.getBoolean(SvnTools.PROPERTY_EXTERNALS, true));
repositories.put(id, repo);
Modified: labs/shotoku/trunk/shotoku.iml
===================================================================
--- labs/shotoku/trunk/shotoku.iml 2006-07-18 17:30:52 UTC (rev 5147)
+++ labs/shotoku/trunk/shotoku.iml 2006-07-18 18:06:58 UTC (rev 5148)
@@ -3,8 +3,9 @@
<component name="ModuleRootManager" />
<component name="NewModuleRootManager">
<output url="file://$MODULE_DIR$" />
- <exclude-output />
- <content url="file://$MODULE_DIR$" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ </content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntryProperties />
Modified: labs/shotoku/trunk/src/app/META-INF/jboss-service.xml
===================================================================
--- labs/shotoku/trunk/src/app/META-INF/jboss-service.xml 2006-07-18 17:30:52 UTC (rev 5147)
+++ labs/shotoku/trunk/src/app/META-INF/jboss-service.xml 2006-07-18 18:06:58 UTC (rev 5148)
@@ -1,3 +1,10 @@
<server>
-
+ <!--<mbean code="org.jboss.security.plugins.JaasSecurityDomain"
+ name="shotoku:service=SecurityDomain">
+ <constructor>
+ <arg type="java.lang.String" value="shotokuCert"/>
+ </constructor>
+ <attribute name="KeyStoreURL">resource:shotoku.keystore</attribute>
+ <attribute name="KeyStorePass">ShotokuPassword</attribute>
+ </mbean>-->
</server>
Modified: labs/shotoku/trunk/src/app/META-INF/login-config.xml
===================================================================
--- labs/shotoku/trunk/src/app/META-INF/login-config.xml 2006-07-18 17:30:52 UTC (rev 5147)
+++ labs/shotoku/trunk/src/app/META-INF/login-config.xml 2006-07-18 18:06:58 UTC (rev 5148)
@@ -1,16 +1,32 @@
<?xml version='1.0'?>
<!DOCTYPE policy PUBLIC
- "-//JBoss//DTD JBOSS Security Config 3.0//EN"
- "http://www.jboss.org/j2ee/dtd/security_config.dtd">
+ "-//JBoss//DTD JBOSS Security Config 3.0//EN"
+ "http://www.jboss.org/j2ee/dtd/security_config.dtd">
<policy>
<application-policy name="shotoku">
- <authentication>
- <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
- flag="required">
- <module-option name="usersProperties">users.properties</module-option>
- <module-option name="rolesProperties">roles.properties</module-option>
- </login-module>
- </authentication>
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required">
+ <module-option name="usersProperties">users.properties</module-option>
+ <module-option name="rolesProperties">roles.properties</module-option>
+ </login-module>
+ </authentication>
</application-policy>
+
+ <!--<application-policy name="shotokuCert">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.BaseCertLoginModule"
+ flag="required">
+ <module-option name="password-stacking">useFirstPass</module-option>
+ <module-option name="securityDomain">java:/jaas/shotokuCert</module-option>
+ </login-module>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required">
+ <module-option name="password-stacking">useFirstPass</module-option>
+ <module-option name="usersProperties">users.properties</module-option>
+ <module-option name="rolesProperties">roles.properties</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>-->
</policy>
More information about the jboss-svn-commits
mailing list