[jboss-svn-commits] JBL Code SVN: r5194 - in labs/shotoku/trunk: . app app/META-INF shotoku-admin shotoku-admin/src/java/org/jboss/shotoku/web/admin shotoku-admin/src/web shotoku-aop shotoku-base/src/java/org/jboss/shotoku shotoku-base/src/java/org/jboss/shotoku/service shotoku-base/src/java/org/jboss/shotoku/tools shotoku-feeds shotoku-files/src/java/org/jboss/shotoku/files shotoku-jcr/src/java/org/jboss/shotoku/jcr shotoku-svn/src/java/org/jboss/shotoku/svn shotoku-tags/src/java/org/jboss/shotoku/tags/service shotoku-test shotoku-test/src/java/org/jboss/shotoku/test shotoku-web src/app/META-INF
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jul 20 11:09:41 EDT 2006
Author: adamw
Date: 2006-07-20 11:09:25 -0400 (Thu, 20 Jul 2006)
New Revision: 5194
Added:
labs/shotoku/trunk/app/
labs/shotoku/trunk/app/META-INF/
labs/shotoku/trunk/app/META-INF/jboss-service.xml
labs/shotoku/trunk/app/META-INF/login-config.xml
Modified:
labs/shotoku/trunk/shotoku-admin/shotoku-admin.iml
labs/shotoku/trunk/shotoku-admin/src/java/org/jboss/shotoku/web/admin/AdminServlet.java
labs/shotoku/trunk/shotoku-admin/src/web/roles.properties
labs/shotoku/trunk/shotoku-aop/shotoku-aop.iml
labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/ContentManager.java
labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/NodeList.java
labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/AdministratedService.java
labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/Null.java
labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/ConcurrentHashSet.java
labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/Tools.java
labs/shotoku/trunk/shotoku-feeds/shotoku-feeds.iml
labs/shotoku/trunk/shotoku-files/src/java/org/jboss/shotoku/files/FileContentManager.java
labs/shotoku/trunk/shotoku-jcr/src/java/org/jboss/shotoku/jcr/JcrContentManager.java
labs/shotoku/trunk/shotoku-jcr/src/java/org/jboss/shotoku/jcr/JcrResource.java
labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/AbstractSvnResource.java
labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnContentManager.java
labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java
labs/shotoku/trunk/shotoku-test/shotoku-test.iml
labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/AddDeleteTest.java
labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/CopyMoveTest.java
labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/GetResourceTest.java
labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/MultiSaveTest.java
labs/shotoku/trunk/shotoku-web/shotoku-web.iml
labs/shotoku/trunk/src/app/META-INF/jboss-service.xml
labs/shotoku/trunk/src/app/META-INF/login-config.xml
Log:
Refactoring
Added: labs/shotoku/trunk/app/META-INF/jboss-service.xml
===================================================================
--- labs/shotoku/trunk/app/META-INF/jboss-service.xml 2006-07-20 15:02:32 UTC (rev 5193)
+++ labs/shotoku/trunk/app/META-INF/jboss-service.xml 2006-07-20 15:09:25 UTC (rev 5194)
@@ -0,0 +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:server.keystore</attribute>
+ <attribute name="KeyStorePass">servercert</attribute>
+ </mbean>
+</server>
Added: labs/shotoku/trunk/app/META-INF/login-config.xml
===================================================================
--- labs/shotoku/trunk/app/META-INF/login-config.xml 2006-07-20 15:02:32 UTC (rev 5193)
+++ labs/shotoku/trunk/app/META-INF/login-config.xml 2006-07-20 15:09:25 UTC (rev 5194)
@@ -0,0 +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">
+
+<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>
+ </application-policy>
+
+ <application-policy name="shotokuCert">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.BaseCertLoginModule"
+ flag="sufficient">
+ <module-option name="securityDomain">java:/jaas/shotokuCert</module-option>
+ <module-option name="password-stacking">useFirstPass</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>
Modified: labs/shotoku/trunk/shotoku-admin/shotoku-admin.iml
===================================================================
--- labs/shotoku/trunk/shotoku-admin/shotoku-admin.iml 2006-07-20 15:02:32 UTC (rev 5193)
+++ labs/shotoku/trunk/shotoku-admin/shotoku-admin.iml 2006-07-20 15:09:25 UTC (rev 5194)
@@ -12,6 +12,7 @@
<orderEntry type="library" name="jboss" level="application" />
<orderEntry type="module" module-name="shotoku-aop" />
<orderEntry type="module" module-name="shotoku-base" />
+ <orderEntry type="module" module-name="shotoku-svn" />
<orderEntryProperties />
</component>
</module>
Modified: labs/shotoku/trunk/shotoku-admin/src/java/org/jboss/shotoku/web/admin/AdminServlet.java
===================================================================
--- labs/shotoku/trunk/shotoku-admin/src/java/org/jboss/shotoku/web/admin/AdminServlet.java 2006-07-20 15:02:32 UTC (rev 5193)
+++ labs/shotoku/trunk/shotoku-admin/src/java/org/jboss/shotoku/web/admin/AdminServlet.java 2006-07-20 15:09:25 UTC (rev 5194)
@@ -8,7 +8,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.ServletException;
-import javax.servlet.ServletResponse;
import java.io.IOException;
import java.util.Calendar;
import java.util.Set;
@@ -17,7 +16,7 @@
* @author Adam Warski (adamw at aster.pl)
*/
public class AdminServlet extends HttpServlet {
- public static final String SERVICE_JSP = "/repo-access/services.jsp";
+ private static final String SERVICE_JSP = "/repo-access/services.jsp";
private AdministratedService getServiceWithId(String serviceId,
Set<AdministratedServiceGetter> asgs) {
Modified: labs/shotoku/trunk/shotoku-admin/src/web/roles.properties
===================================================================
--- labs/shotoku/trunk/shotoku-admin/src/web/roles.properties 2006-07-20 15:02:32 UTC (rev 5193)
+++ labs/shotoku/trunk/shotoku-admin/src/web/roles.properties 2006-07-20 15:09:25 UTC (rev 5194)
@@ -1,3 +1,3 @@
ShotokuAdmin=ShotokuAdmin
-CN\=localhost,\ OU\=MYOU,\ O\=MYORG,\ L\=MYCITY,\ ST\=MYSTATE,\ C\=MY=ShotokuAdmin
+CN\=ClientCert,\ O\=SomeCA,\ OU\=SomeCAOrg=ShotokuAdmin,ShotokuUpdate
ShotokuUpdate=ShotokuUpdate
\ No newline at end of file
Modified: labs/shotoku/trunk/shotoku-aop/shotoku-aop.iml
===================================================================
--- labs/shotoku/trunk/shotoku-aop/shotoku-aop.iml 2006-07-20 15:02:32 UTC (rev 5193)
+++ labs/shotoku/trunk/shotoku-aop/shotoku-aop.iml 2006-07-20 15:09:25 UTC (rev 5194)
@@ -11,6 +11,7 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="shotoku-base" />
<orderEntry type="library" name="jboss" level="application" />
+ <orderEntry type="library" name="aop" level="application" />
<orderEntryProperties />
</component>
</module>
Modified: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/ContentManager.java
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/ContentManager.java 2006-07-20 15:02:32 UTC (rev 5193)
+++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/ContentManager.java 2006-07-20 15:09:25 UTC (rev 5194)
@@ -131,14 +131,14 @@
* Saves the given resources at one time. Recommended if you have multiple
* resources to save.
*
+ * @param logMessage
+ * Log message to save with.
* @param resources
* Resources to save.
- * @param logMessage
- * Log message to save with.
* @throws SaveException
* @throws RepositoryException
*/
- public abstract void save(Collection<Resource> resources, String logMessage)
+ public abstract void save(String logMessage, Collection<Resource> resources)
throws SaveException, RepositoryException;
/**
@@ -178,11 +178,11 @@
* @throws SaveException
* @throws RepositoryException
*/
- public void save(Resource res, String logMessage) throws SaveException,
+ public void save(String logMessage, Resource res) throws SaveException,
RepositoryException {
List<Resource> toSave = new ArrayList<Resource>();
toSave.add(res);
- save(toSave, logMessage);
+ save(logMessage, toSave);
}
/**
@@ -204,7 +204,7 @@
toSave.add(resource);
}
- save(toSave, logMessage);
+ save(logMessage, toSave);
}
/**
@@ -232,21 +232,21 @@
* <code>save(Collection, String)</code>, where the collection is filled
* with the two given resources.
*
+ * @param logMessage
+ * Log message to save with.
* @param res1
* First resource to save.
* @param res2
* Second resource to save.
- * @param logMessage
- * Log message to save with.
* @throws SaveException
* @throws RepositoryException
*/
- public void save(Resource res1, Resource res2, String logMessage)
+ public void save(String logMessage, Resource res1, Resource res2)
throws SaveException, RepositoryException {
List<Resource> toSave = new ArrayList<Resource>();
toSave.add(res1);
toSave.add(res2);
- save(toSave, logMessage);
+ save(logMessage, toSave);
}
/**
@@ -254,24 +254,24 @@
* <code>save(Collection, String)</code>, where the collection is filled
* with the three given resources.
*
+ * @param logMessage
+ * Log message to save with.
* @param res1
* First resource to save.
* @param res2
* Second resource to save.
* @param res3
* Third resource to save.
- * @param logMessage
- * Log message to save with.
* @throws SaveException
* @throws RepositoryException
*/
- public void save(Resource res1, Resource res2, Resource res3,
- String logMessage) throws SaveException, RepositoryException {
+ public void save(String logMessage, Resource res1, Resource res2,
+ Resource res3) throws SaveException, RepositoryException {
List<Resource> toSave = new ArrayList<Resource>();
toSave.add(res1);
toSave.add(res2);
toSave.add(res3);
- save(toSave, logMessage);
+ save(logMessage, toSave);
}
/**
@@ -279,6 +279,8 @@
* <code>save(Collection, String)</code>, where the collection is filled
* with the four given resources.
*
+ * @param logMessage
+ * Log message to save with.
* @param res1
* First resource to save.
* @param res2
@@ -287,20 +289,18 @@
* Third resource to save.
* @param res4
* Fourth resource to save.
- * @param logMessage
- * Log message to save with.
* @throws SaveException
* @throws RepositoryException
*/
- public void save(Resource res1, Resource res2, Resource res3,
- Resource res4, String logMessage) throws SaveException,
+ public void save(String logMessage, Resource res1, Resource res2,
+ Resource res3, Resource res4) throws SaveException,
RepositoryException {
List<Resource> toSave = new ArrayList<Resource>();
toSave.add(res1);
toSave.add(res2);
toSave.add(res3);
toSave.add(res4);
- save(toSave, logMessage);
+ save(logMessage, toSave);
}
/**
@@ -308,6 +308,8 @@
* <code>save(Collection, String)</code>, where the collection is filled
* with the five given resources.
*
+ * @param logMessage
+ * Log message to save with.
* @param res1
* First resource to save.
* @param res2
@@ -318,13 +320,11 @@
* Fourth resource to save.
* @param res5
* Fifth resource to save.
- * @param logMessage
- * Log message to save with.
* @throws SaveException
* @throws RepositoryException
*/
- public void save(Resource res1, Resource res2, Resource res3,
- Resource res4, Resource res5, String logMessage)
+ public void save(String logMessage, Resource res1, Resource res2,
+ Resource res3, Resource res4, Resource res5)
throws SaveException, RepositoryException {
List<Resource> toSave = new ArrayList<Resource>();
toSave.add(res1);
@@ -332,7 +332,7 @@
toSave.add(res3);
toSave.add(res4);
toSave.add(res5);
- save(toSave, logMessage);
+ save(logMessage, toSave);
}
/**
Modified: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/NodeList.java
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/NodeList.java 2006-07-20 15:02:32 UTC (rev 5193)
+++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/NodeList.java 2006-07-20 15:09:25 UTC (rev 5194)
@@ -56,15 +56,6 @@
nodeList.add(node);
return true;
}
-
- /**
- * Adds all of the given nodes to this node list.
- *
- * @param coll Node collection to add.
- */
- public void addAll(Collection<Node> coll) {
- nodeList.addAll(coll);
- }
/**
* Adds nodes from the given node list to this node list.
Modified: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/AdministratedService.java
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/AdministratedService.java 2006-07-20 15:02:32 UTC (rev 5193)
+++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/AdministratedService.java 2006-07-20 15:09:25 UTC (rev 5194)
@@ -3,6 +3,8 @@
import java.util.Date;
/**
+ * A base class for services that can be started and stopped via the
+ * ShotokuAdmin web application and are periodically updated.
* @author Adam Warski (adamw at aster.pl)
*/
public interface AdministratedService {
Modified: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/Null.java
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/Null.java 2006-07-20 15:02:32 UTC (rev 5193)
+++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/Null.java 2006-07-20 15:09:25 UTC (rev 5194)
@@ -1,6 +1,8 @@
package org.jboss.shotoku.service;
/**
+ * A class that represents a "null" value - it is needed as nulls can't be
+ * stored as values in a ConcurrentHashMap.
* @author Adam Warski (adamw at aster.pl)
*/
public class Null {
Modified: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/ConcurrentHashSet.java
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/ConcurrentHashSet.java 2006-07-20 15:02:32 UTC (rev 5193)
+++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/ConcurrentHashSet.java 2006-07-20 15:09:25 UTC (rev 5194)
@@ -40,11 +40,7 @@
}
public boolean add(K o) {
- if (map.putIfAbsent(o, Boolean.TRUE) == null) {
- return true;
- } else {
- return false;
- }
+ return map.putIfAbsent(o, Boolean.TRUE) == null;
}
public boolean remove(Object o) {
Modified: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/Tools.java
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/Tools.java 2006-07-20 15:02:32 UTC (rev 5193)
+++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/Tools.java 2006-07-20 15:09:25 UTC (rev 5194)
@@ -246,11 +246,12 @@
* their equals method returns true.
* @param obj1 First object to compare.
* @param obj2 Second object to compare.
- * @return True iff both objects are equal or if their equals
- * method returns true.
+ * @return True iff both objects are equal to null or if
+ * their equals method returns true.
*/
public static boolean objectsEqual(Object obj1, Object obj2) {
- return (obj1 == null && obj2 == null) || obj1.equals(obj2);
+ return (obj1 == null && obj2 == null) ||
+ ((obj1 != null) && (obj1.equals(obj2)));
}
/**
@@ -379,4 +380,16 @@
public static String getNameBasedMimeType(File file) {
return mimeTypes.getContentType(file);
}
+
+ /*
+ * TUPLES
+ */
+
+ public static<A, B> Pair<A, B> createPair(A a, B b) {
+ return new Pair<A, B>(a, b);
+ }
+
+ public static<A, B, C> Triple<A, B, C> createTriple(A a, B b, C c) {
+ return new Triple<A, B, C>(a, b, c);
+ }
}
Modified: labs/shotoku/trunk/shotoku-feeds/shotoku-feeds.iml
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/shotoku-feeds.iml 2006-07-20 15:02:32 UTC (rev 5193)
+++ labs/shotoku/trunk/shotoku-feeds/shotoku-feeds.iml 2006-07-20 15:09:25 UTC (rev 5194)
@@ -15,6 +15,7 @@
<orderEntry type="library" name="jboss" level="application" />
<orderEntry type="library" name="velocity" level="application" />
<orderEntry type="module" module-name="shotoku-tags" />
+ <orderEntry type="library" name="junit" level="application" />
<orderEntryProperties />
</component>
</module>
Modified: labs/shotoku/trunk/shotoku-files/src/java/org/jboss/shotoku/files/FileContentManager.java
===================================================================
--- labs/shotoku/trunk/shotoku-files/src/java/org/jboss/shotoku/files/FileContentManager.java 2006-07-20 15:02:32 UTC (rev 5193)
+++ labs/shotoku/trunk/shotoku-files/src/java/org/jboss/shotoku/files/FileContentManager.java 2006-07-20 15:09:25 UTC (rev 5194)
@@ -118,7 +118,7 @@
}
@Override
- public void save(Collection<Resource> resources, String message)
+ public void save(String message, Collection<Resource> resources)
throws SaveException, RepositoryException {
for (Resource resource : resources) {
resource.save(message);
Modified: labs/shotoku/trunk/shotoku-jcr/src/java/org/jboss/shotoku/jcr/JcrContentManager.java
===================================================================
--- labs/shotoku/trunk/shotoku-jcr/src/java/org/jboss/shotoku/jcr/JcrContentManager.java 2006-07-20 15:02:32 UTC (rev 5193)
+++ labs/shotoku/trunk/shotoku-jcr/src/java/org/jboss/shotoku/jcr/JcrContentManager.java 2006-07-20 15:09:25 UTC (rev 5194)
@@ -163,7 +163,7 @@
return new JcrDirectory(this, repository, connector, path, false);
}
- public void save(Collection<Resource> resources, String logMessage)
+ public void save(String logMessage, Collection<Resource> resources)
throws SaveException, RepositoryException {
Session session = null;
try {
Modified: labs/shotoku/trunk/shotoku-jcr/src/java/org/jboss/shotoku/jcr/JcrResource.java
===================================================================
--- labs/shotoku/trunk/shotoku-jcr/src/java/org/jboss/shotoku/jcr/JcrResource.java 2006-07-20 15:02:32 UTC (rev 5193)
+++ labs/shotoku/trunk/shotoku-jcr/src/java/org/jboss/shotoku/jcr/JcrResource.java 2006-07-20 15:09:25 UTC (rev 5194)
@@ -429,7 +429,7 @@
}
public void save(String logMessage) throws SaveException, RepositoryException {
- getJcrCm().save(this, logMessage);
+ getJcrCm().save(logMessage, this);
}
public void delete() throws DeleteException, RepositoryException {
Modified: labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/AbstractSvnResource.java
===================================================================
--- labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/AbstractSvnResource.java 2006-07-20 15:02:32 UTC (rev 5193)
+++ labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/AbstractSvnResource.java 2006-07-20 15:09:25 UTC (rev 5194)
@@ -163,7 +163,7 @@
Set<Resource> toCommit = new HashSet<Resource>();
toCommit.add(this);
- getSvnCm().save(toCommit, logMessage);
+ getSvnCm().save(logMessage, toCommit);
}
public String getProperty(String name) {
Modified: labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnContentManager.java
===================================================================
--- labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnContentManager.java 2006-07-20 15:02:32 UTC (rev 5193)
+++ labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnContentManager.java 2006-07-20 15:09:25 UTC (rev 5194)
@@ -354,7 +354,7 @@
}
@Override
- public void save(Collection<Resource> resources, String logMessage)
+ public void save(String logMessage, Collection<Resource> resources)
throws SaveException {
/*
* Collection all operations to perform - duplicates are automatically
Modified: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java
===================================================================
--- labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java 2006-07-20 15:02:32 UTC (rev 5193)
+++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java 2006-07-20 15:09:25 UTC (rev 5194)
@@ -181,7 +181,7 @@
}
try {
- cm.save(toSave, "");
+ cm.save("", toSave);
} catch (SaveException e) {
log.warn(e);
return;
Modified: labs/shotoku/trunk/shotoku-test/shotoku-test.iml
===================================================================
--- labs/shotoku/trunk/shotoku-test/shotoku-test.iml 2006-07-20 15:02:32 UTC (rev 5193)
+++ labs/shotoku/trunk/shotoku-test/shotoku-test.iml 2006-07-20 15:09:25 UTC (rev 5194)
@@ -12,6 +12,8 @@
<orderEntry type="module" module-name="shotoku-aop" />
<orderEntry type="module" module-name="shotoku-base" />
<orderEntry type="library" name="jboss" level="application" />
+ <orderEntry type="library" name="junit" level="application" />
+ <orderEntry type="library" name="jcr" level="application" />
<orderEntryProperties />
</component>
</module>
Modified: labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/AddDeleteTest.java
===================================================================
--- labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/AddDeleteTest.java 2006-07-20 15:02:32 UTC (rev 5193)
+++ labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/AddDeleteTest.java 2006-07-20 15:09:25 UTC (rev 5194)
@@ -27,11 +27,7 @@
import org.jboss.shotoku.Directory;
import org.jboss.shotoku.Node;
import org.jboss.shotoku.Resource;
-import org.jboss.shotoku.exceptions.DeleteException;
-import org.jboss.shotoku.exceptions.RepositoryException;
-import org.jboss.shotoku.exceptions.ResourceAlreadyExists;
import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
-import org.jboss.shotoku.exceptions.SaveException;
/**
* @author Adam Warski (adamw at aster.pl)
@@ -61,7 +57,7 @@
assertTrue(n1.hasModifications());
assertTrue(d1.hasModifications());
- cm.save(parent, n1, d2, "");
+ cm.save("", parent, n1, d2);
assertFalse(n1.hasModifications());
assertFalse(d2.hasModifications());
Modified: labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/CopyMoveTest.java
===================================================================
--- labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/CopyMoveTest.java 2006-07-20 15:02:32 UTC (rev 5193)
+++ labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/CopyMoveTest.java 2006-07-20 15:09:25 UTC (rev 5194)
@@ -44,7 +44,7 @@
Node n1 = dir1.newNode("node1");
n1.setContent(TEST_CONTENT);
- cm.save(parent, dir1, dir2, n1, "setup");
+ cm.save("setup", parent, dir1, dir2, n1);
}
public void testHistoryCopy() throws Exception {
Modified: labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/GetResourceTest.java
===================================================================
--- labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/GetResourceTest.java 2006-07-20 15:02:32 UTC (rev 5193)
+++ labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/GetResourceTest.java 2006-07-20 15:09:25 UTC (rev 5194)
@@ -23,7 +23,7 @@
Node node2 = dir1.newNode("g");
Node node3 = dir1.newNode("h");
- cm.save(dir1, dir2, node1, node2, node3, "get-res-test");
+ cm.save("get-res-test", dir1, dir2, node1, node2, node3);
}
public void testGetChildren() throws Exception {
Modified: labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/MultiSaveTest.java
===================================================================
--- labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/MultiSaveTest.java 2006-07-20 15:02:32 UTC (rev 5193)
+++ labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/MultiSaveTest.java 2006-07-20 15:09:25 UTC (rev 5194)
@@ -45,7 +45,7 @@
newNode2.setContent("P");
- cm.save(newDir1, newDir2, newNode1, newNode2, "");
+ cm.save("", newDir1, newDir2, newNode1, newNode2);
assertTrue("P".equals(cm.getNode(TEST_DIR + "/a/b/c/z/aaa").getContent()));
}
Modified: labs/shotoku/trunk/shotoku-web/shotoku-web.iml
===================================================================
--- labs/shotoku/trunk/shotoku-web/shotoku-web.iml 2006-07-20 15:02:32 UTC (rev 5193)
+++ labs/shotoku/trunk/shotoku-web/shotoku-web.iml 2006-07-20 15:09:25 UTC (rev 5194)
@@ -12,6 +12,7 @@
<orderEntry type="module" module-name="shotoku-aop" />
<orderEntry type="module" module-name="shotoku-base" />
<orderEntry type="library" name="jboss" level="application" />
+ <orderEntry type="library" name="myfaces" level="application" />
<orderEntryProperties />
</component>
</module>
Modified: labs/shotoku/trunk/src/app/META-INF/jboss-service.xml
===================================================================
--- labs/shotoku/trunk/src/app/META-INF/jboss-service.xml 2006-07-20 15:02:32 UTC (rev 5193)
+++ labs/shotoku/trunk/src/app/META-INF/jboss-service.xml 2006-07-20 15:09:25 UTC (rev 5194)
@@ -4,7 +4,7 @@
<constructor>
<arg type="java.lang.String" value="shotokuCert"/>
</constructor>
- <attribute name="KeyStoreURL">resource:shotoku.keystore</attribute>
- <attribute name="KeyStorePass">ShotokuPassword</attribute>
+ <attribute name="KeyStoreURL">resource:server.keystore</attribute>
+ <attribute name="KeyStorePass">servercert</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-20 15:02:32 UTC (rev 5193)
+++ labs/shotoku/trunk/src/app/META-INF/login-config.xml 2006-07-20 15:09:25 UTC (rev 5194)
@@ -17,9 +17,9 @@
<!--<application-policy name="shotokuCert">
<authentication>
<login-module code="org.jboss.security.auth.spi.BaseCertLoginModule"
- flag="required">
+ flag="sufficient">
+ <module-option name="securityDomain">java:/jaas/shotokuCert</module-option>
<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">
More information about the jboss-svn-commits
mailing list