You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2011/04/25 11:19:32 UTC
svn commit: r1096439 [1/7] - in /incubator/isis/trunk/core/commons/src:
main/java/org/apache/isis/core/commons/authentication/
main/java/org/apache/isis/core/commons/components/
main/java/org/apache/isis/core/commons/config/ main/java/org/apache/isis/c...
Author: danhaywood
Date: Mon Apr 25 09:19:29 2011
New Revision: 1096439
URL: http://svn.apache.org/viewvc?rev=1096439&view=rev
Log:
ISIS-22: code cleanup of core.commons
Modified:
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSession.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionAbstract.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProvider.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProviderAbstract.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProviderAware.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionUtils.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/ApplicationScopedComponent.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/Component.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/Injectable.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/Installer.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/Noop.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/Resettable.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/SessionScopedComponent.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/TransactionScopedComponent.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/ConfigurationConstants.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/InstallerAbstract.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfiguration.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationAware.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilder.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderAware.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderDefault.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderFileSystem.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderPrimer.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderResourceStreams.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationException.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/JmxBeanServer.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/NotFoundPolicy.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/PropertiesReader.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/debug/DebugBuilder.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/debug/DebugHtmlString.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/debug/DebugHtmlStringAbstract.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/debug/DebugString.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/debug/DebugTee.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/debug/DebugUtils.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/debug/Debuggable.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/debug/DebuggableWithTitle.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataInputExtended.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataInputExtendedDecorator.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataInputStreamExtended.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataOutputExtended.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataOutputExtendedDecorator.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataOutputStreamExtended.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DebugDataInputExtended.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DebugDataOutputExtended.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/Encodable.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/EncodingConstants.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/FailedToDecodeException.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/FailedToDeserializeException.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/FieldType.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/ensure/Assert.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/ensure/Ensure.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/ensure/IsisAssertException.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisApplicationException.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisException.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/NotYetImplementedException.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/UnexpectedCallException.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/UnknownTypeException.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/factory/InstanceCreationClassException.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/factory/InstanceCreationException.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/factory/InstanceUtil.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/factory/UnavailableClassException.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/io/LazyInputStream.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ArrayUtil.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ArrayUtils.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/CastUtils.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ClassUtil.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/HashCodeUtils.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/IoUtils.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/JavaClassUtils.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ListUtils.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/LocaleUtils.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/MapUtils.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/MethodUtils.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/NameUtils.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/PathUtils.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/Resources.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/StringBuilderUtils.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/StringUtils.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/Threads.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ThrowableUtils.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ToString.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/WrapperUtils.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSource.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceAbstract.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceComposite.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceContextLoaderClassPath.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceCurrentClassClassPath.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceFileSystem.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/xml/ContentWriter.java
incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/xml/XmlFile.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderFileSystemTest.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderResourceStreamsConfigResourceAndPolicyTest.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderTwoDirectoriesTest.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/config/IsisConfigurationDefault_PropertNamesTest.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/config/IsisConfigurationDefault_WhitespaceTest.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/debug/DebugStringTest.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/encoding/ByteEncoderDecoderRoundtripTest.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/encoding/EncodabilityContractTest.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/ensure/Ensure_GivenValueThatDoesMatchTest.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/ensure/Ensure_GivenValueThatDoesNotMatchTest.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/lang/IoUtils_CopyTest.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/lang/JavaClassUtilsTest.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/lang/LocaleUtilsTest.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/lang/NameUtilTest.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/lang/PrintLocale.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NaturalNameTest.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NaturalizeTest.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NormalizedTest.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NormalizedVarargsTest.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/lang/StringUtils_RemoveLeadingWhiteSpace.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/lang/StringUtils_SplitOnCommas.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/lang/StringUtils_StripLeadingSlashTest.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/lang/StringUtils_StripNewLinesTest.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/lang/StringUtils_toLineSeparated.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_ContainsStripNewLinesTest.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_EndsWithStripNewLinesTest.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_EqualToStripNewLinesTest.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_NonEmptyStringOrNullTest.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_NonEmptyStringTest.java
incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_StartsWithStripNewLinesTest.java
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSession.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSession.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSession.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSession.java Mon Apr 25 09:19:29 2011
@@ -17,25 +17,23 @@
* under the License.
*/
-
package org.apache.isis.core.commons.authentication;
import java.util.List;
import org.apache.isis.core.commons.encoding.Encodable;
-
/**
* The representation within the system of an authenticated user.
*/
public interface AuthenticationSession extends Encodable {
- /**
+ /**
* The name of the authenticated user; for display purposes only.
*/
public String getUserName();
- public boolean hasUserNameOf(String userName);
+ public boolean hasUserNameOf(String userName);
/**
* The roles this user belongs to
@@ -46,18 +44,17 @@ public interface AuthenticationSession e
* A unique code given to this session during authentication.
*
* <p>
- * This can be used to confirm that this session has been properly created and the user has been
- * authenticated. It should return an empty string (<tt>""</tt>) if this is unauthenticated user (i.e., as
- * created within an exploration system).
+ * This can be used to confirm that this session has been properly created and the user has been authenticated. It
+ * should return an empty string (<tt>""</tt>) if this is unauthenticated user (i.e., as created within an
+ * exploration system).
*/
public String getValidationCode();
-
+
/**
- * For viewers (in particular) to store additional attributes, analogous to an
- * <tt>HttpSession</tt>.
+ * For viewers (in particular) to store additional attributes, analogous to an <tt>HttpSession</tt>.
*/
public Object getAttribute(String attributeName);
-
+
/**
* @see #getAttribute(String)
*/
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionAbstract.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionAbstract.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionAbstract.java Mon Apr 25 09:19:29 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.commons.authentication;
-package org.apache.isis.core.commons.authentication;
-
import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
@@ -32,110 +31,107 @@ import java.util.Map;
import org.apache.isis.core.commons.encoding.DataInputExtended;
import org.apache.isis.core.commons.encoding.DataOutputExtended;
import org.apache.isis.core.commons.lang.ToString;
-
-public abstract class AuthenticationSessionAbstract implements AuthenticationSession, Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private final String name;
- private final List<String> roles = new ArrayList<String>();
- private final String code;
-
- private final Map<String, Object> attributeByName = new HashMap<String, Object>();
-
-
- /////////////////////////////////////////////////////////
- // Constructor, encode
- /////////////////////////////////////////////////////////
-
- @SuppressWarnings("unchecked")
- public AuthenticationSessionAbstract(String name, String code) {
- this(name, Collections.EMPTY_LIST, code);
- }
-
- public AuthenticationSessionAbstract(String name, List<String> roles, String code) {
- this.name = name;
- this.roles.addAll(roles);
- this.code = code;
- initialized();
- }
-
- public AuthenticationSessionAbstract(final DataInputExtended input) throws IOException {
- this.name = input.readUTF();
- this.roles.addAll(Arrays.asList(input.readUTFs()));
- this.code = input.readUTF();
- initialized();
- }
-
-
- public void encode(final DataOutputExtended output) throws IOException {
- output.writeUTF(getUserName());
- output.writeUTFs(roles.toArray(new String[]{}));
- output.writeUTF(code);
- }
-
- private void initialized() {
- // nothing to do
- }
-
- /////////////////////////////////////////////////////////
- // User Name
- /////////////////////////////////////////////////////////
-
- public String getUserName() {
- return name;
- }
-
- public boolean hasUserNameOf(final String userName) {
- return userName == null ? false : userName.equals(getUserName());
- }
-
-
- /////////////////////////////////////////////////////////
- // Roles
- /////////////////////////////////////////////////////////
-
- /**
- * Can be overridden.
- */
- public List<String> getRoles() {
- return Collections.unmodifiableList(roles);
- }
-
-
- /////////////////////////////////////////////////////////
- // Code
- /////////////////////////////////////////////////////////
-
- public String getValidationCode() {
- return code;
- }
-
-
- /////////////////////////////////////////////////////////
- // Attributes
- /////////////////////////////////////////////////////////
-
-
- public Object getAttribute(String attributeName) {
- return attributeByName.get(attributeName);
- }
-
-
- public void setAttribute(String attributeName, Object attribute) {
- attributeByName.put(attributeName, attribute);
- }
-
-
- /////////////////////////////////////////////////////////
- // toString
- /////////////////////////////////////////////////////////
-
- @Override
- public String toString() {
- return new ToString(this).append("name", getUserName()).append("code", getValidationCode()).toString();
- }
-
-
-
-}
+
+public abstract class AuthenticationSessionAbstract implements AuthenticationSession, Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String name;
+ private final List<String> roles = new ArrayList<String>();
+ private final String code;
+
+ private final Map<String, Object> attributeByName = new HashMap<String, Object>();
+
+ // ///////////////////////////////////////////////////////
+ // Constructor, encode
+ // ///////////////////////////////////////////////////////
+
+ @SuppressWarnings("unchecked")
+ public AuthenticationSessionAbstract(final String name, final String code) {
+ this(name, Collections.EMPTY_LIST, code);
+ }
+
+ public AuthenticationSessionAbstract(final String name, final List<String> roles, final String code) {
+ this.name = name;
+ this.roles.addAll(roles);
+ this.code = code;
+ initialized();
+ }
+
+ public AuthenticationSessionAbstract(final DataInputExtended input) throws IOException {
+ this.name = input.readUTF();
+ this.roles.addAll(Arrays.asList(input.readUTFs()));
+ this.code = input.readUTF();
+ initialized();
+ }
+
+ @Override
+ public void encode(final DataOutputExtended output) throws IOException {
+ output.writeUTF(getUserName());
+ output.writeUTFs(roles.toArray(new String[] {}));
+ output.writeUTF(code);
+ }
+
+ private void initialized() {
+ // nothing to do
+ }
+
+ // ///////////////////////////////////////////////////////
+ // User Name
+ // ///////////////////////////////////////////////////////
+
+ @Override
+ public String getUserName() {
+ return name;
+ }
+
+ @Override
+ public boolean hasUserNameOf(final String userName) {
+ return userName == null ? false : userName.equals(getUserName());
+ }
+
+ // ///////////////////////////////////////////////////////
+ // Roles
+ // ///////////////////////////////////////////////////////
+
+ /**
+ * Can be overridden.
+ */
+ @Override
+ public List<String> getRoles() {
+ return Collections.unmodifiableList(roles);
+ }
+
+ // ///////////////////////////////////////////////////////
+ // Code
+ // ///////////////////////////////////////////////////////
+
+ @Override
+ public String getValidationCode() {
+ return code;
+ }
+
+ // ///////////////////////////////////////////////////////
+ // Attributes
+ // ///////////////////////////////////////////////////////
+
+ @Override
+ public Object getAttribute(final String attributeName) {
+ return attributeByName.get(attributeName);
+ }
+
+ @Override
+ public void setAttribute(final String attributeName, final Object attribute) {
+ attributeByName.put(attributeName, attribute);
+ }
+
+ // ///////////////////////////////////////////////////////
+ // toString
+ // ///////////////////////////////////////////////////////
+
+ @Override
+ public String toString() {
+ return new ToString(this).append("name", getUserName()).append("code", getValidationCode()).toString();
+ }
+
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProvider.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProvider.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProvider.java Mon Apr 25 09:19:29 2011
@@ -28,5 +28,4 @@ public interface AuthenticationSessionPr
*/
AuthenticationSession getAuthenticationSession();
-
}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProviderAbstract.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProviderAbstract.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProviderAbstract.java Mon Apr 25 09:19:29 2011
@@ -16,13 +16,12 @@
*/
package org.apache.isis.core.commons.authentication;
-
public abstract class AuthenticationSessionProviderAbstract implements AuthenticationSessionProvider {
@Override
- public void injectInto(Object candidate) {
+ public void injectInto(final Object candidate) {
if (AuthenticationSessionProviderAware.class.isAssignableFrom(candidate.getClass())) {
- AuthenticationSessionProviderAware cast = AuthenticationSessionProviderAware.class.cast(candidate);
+ final AuthenticationSessionProviderAware cast = AuthenticationSessionProviderAware.class.cast(candidate);
cast.setAuthenticationSessionProvider(this);
}
}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProviderAware.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProviderAware.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProviderAware.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProviderAware.java Mon Apr 25 09:19:29 2011
@@ -17,11 +17,10 @@
* under the License.
*/
+package org.apache.isis.core.commons.authentication;
-package org.apache.isis.core.commons.authentication;
-
-public interface AuthenticationSessionProviderAware {
-
- public void setAuthenticationSessionProvider(AuthenticationSessionProvider authenticationSessionProvider);
-
-}
+public interface AuthenticationSessionProviderAware {
+
+ public void setAuthenticationSessionProvider(AuthenticationSessionProvider authenticationSessionProvider);
+
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionUtils.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionUtils.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionUtils.java Mon Apr 25 09:19:29 2011
@@ -17,26 +17,25 @@
* under the License.
*/
-
package org.apache.isis.core.commons.authentication;
import java.util.List;
-import com.google.common.collect.Lists;
-
import org.apache.isis.applib.security.RoleMemento;
import org.apache.isis.applib.security.UserMemento;
+import com.google.common.collect.Lists;
+
public final class AuthenticationSessionUtils {
- private AuthenticationSessionUtils() {}
+ private AuthenticationSessionUtils() {
+ }
public static UserMemento createUserMemento(final AuthenticationSession session) {
final List<RoleMemento> roles = Lists.newArrayList();
- for (String roleName : session.getRoles()) {
- roles.add(new RoleMemento(roleName));
+ for (final String roleName : session.getRoles()) {
+ roles.add(new RoleMemento(roleName));
}
return new UserMemento(session.getUserName(), roles);
}
}
-
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/ApplicationScopedComponent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/ApplicationScopedComponent.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/ApplicationScopedComponent.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/ApplicationScopedComponent.java Mon Apr 25 09:19:29 2011
@@ -17,29 +17,28 @@
* under the License.
*/
+package org.apache.isis.core.commons.components;
-package org.apache.isis.core.commons.components;
-
-/**
- * Indicate that the implementing component is scoped at application level (shared across multiple
- * sessions) and might also require initialization or being shutdown.
- *
- * <p>
- * Analogous to Hibernate's <tt>SessionFactory</tt>.
- *
- * @see SessionScopedComponent
- * @see TransactionScopedComponent
- */
-public interface ApplicationScopedComponent extends Component {
-
- /**
- * Indicates to the component that it is to initialise itself.
- */
- void init();
-
- /**
- * Indicates to the component that it will no longer be used and should shut itself down cleanly.
- */
- void shutdown();
-
-}
+/**
+ * Indicate that the implementing component is scoped at application level (shared across multiple sessions) and might
+ * also require initialization or being shutdown.
+ *
+ * <p>
+ * Analogous to Hibernate's <tt>SessionFactory</tt>.
+ *
+ * @see SessionScopedComponent
+ * @see TransactionScopedComponent
+ */
+public interface ApplicationScopedComponent extends Component {
+
+ /**
+ * Indicates to the component that it is to initialise itself.
+ */
+ void init();
+
+ /**
+ * Indicates to the component that it will no longer be used and should shut itself down cleanly.
+ */
+ void shutdown();
+
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/Component.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/Component.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/Component.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/Component.java Mon Apr 25 09:19:29 2011
@@ -17,13 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.commons.components;
-package org.apache.isis.core.commons.components;
-
-public interface Component {
-
-
-
-}
-
-
+public interface Component {
+
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/Injectable.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/Injectable.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/Injectable.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/Injectable.java Mon Apr 25 09:19:29 2011
@@ -17,17 +17,13 @@
* under the License.
*/
+package org.apache.isis.core.commons.components;
-package org.apache.isis.core.commons.components;
-
-public interface Injectable {
-
- /**
- * Will inject itself into the candidate if the candidate implements the corresponding <tt>*Aware</tt>
- * type.
- */
- void injectInto(Object candidate);
-
-}
-
-
+public interface Injectable {
+
+ /**
+ * Will inject itself into the candidate if the candidate implements the corresponding <tt>*Aware</tt> type.
+ */
+ void injectInto(Object candidate);
+
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/Installer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/Installer.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/Installer.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/Installer.java Mon Apr 25 09:19:29 2011
@@ -17,83 +17,70 @@
* under the License.
*/
-
package org.apache.isis.core.commons.components;
import java.util.List;
/**
- * A factory for a {@link Component}, defining that component's {@link #getType() type} and its
- * {@link #getName() name}.
+ * A factory for a {@link Component}, defining that component's {@link #getType() type} and its {@link #getName() name}.
*
* <p>
- * The ({@link #getType() type}, {@link #getName() name}) is expected to be
- * a unique identifier of a component.
+ * The ({@link #getType() type}, {@link #getName() name}) is expected to be a unique identifier of a component.
*
* <p>
- * The <i>default runtime</i> (<tt>org.apache.isis.runtimes.dflt</tt> module),
- * which adopts a service locator design,
- * uses the <tt>installer-registry.properties</tt> resource as a registry
- * of all available installers. The installers are loaded and indexed by
- * their name and type. Other runtime implementations may use different
- * approaches.
+ * The <i>default runtime</i> (<tt>org.apache.isis.runtimes.dflt</tt> module), which adopts a service locator design,
+ * uses the <tt>installer-registry.properties</tt> resource as a registry of all available installers. The installers
+ * are loaded and indexed by their name and type. Other runtime implementations may use different approaches.
*/
public interface Installer extends ApplicationScopedComponent {
- /**
- * The type of the installer, meaning the component type, and consistent
- * with the long option of the command line flag where applicable.
- *
- * <p>
- * Examples are <tt>authentication</tt> or <tt>persistor</tt>.
- *
- * <p>
- * Because all implementations of a given subinterface of {@link Installer}
- * should return the same value for this method, by convention these
- * subinterfaces define a constant which the implementation can just return.
- *
- * <p>
- * Used, with {@link #getName()}, to determine the config files and config
- * keys for this installer.
- *
- * @see #getConfigurationResources()
- */
- String getType();
-
- /**
- * The name (qualified by type).
- *
- * <p>
- * Used, with {@link #getType()}, to determine the config files and config
- * keys for this installer.
- *
- * @see #getConfigurationResources()
- */
- String getName();
-
- /**
- * The configuration resources (files) to merge in configuration properties.
- *
- * <p>
- * For example, would return list of [<tt>persistor.properties</tt>,
- * and <tt>persistor_in-memory.properties</tt>] for the in-memory
- * object store.
- *
- * <p>
- * The implementation should look under keys prefixed either
- * <tt>isis.persistor</tt> or
- * <tt>isis.persistor.in-memory</tt>.
- *
- * <p>
- * Note that we use an '_' underscore to join the {@link #getType() type}
- * and {@link #getName() name} in the filenames, but a '.' (period) for the
- * keys.
- */
- List<String> getConfigurationResources();
-
- /**
- * The (classes of) the types that this installer makes available in the {@link #getModule() module}.
- */
- List<Class<?>> getTypes();
+ /**
+ * The type of the installer, meaning the component type, and consistent with the long option of the command line
+ * flag where applicable.
+ *
+ * <p>
+ * Examples are <tt>authentication</tt> or <tt>persistor</tt>.
+ *
+ * <p>
+ * Because all implementations of a given subinterface of {@link Installer} should return the same value for this
+ * method, by convention these subinterfaces define a constant which the implementation can just return.
+ *
+ * <p>
+ * Used, with {@link #getName()}, to determine the config files and config keys for this installer.
+ *
+ * @see #getConfigurationResources()
+ */
+ String getType();
+
+ /**
+ * The name (qualified by type).
+ *
+ * <p>
+ * Used, with {@link #getType()}, to determine the config files and config keys for this installer.
+ *
+ * @see #getConfigurationResources()
+ */
+ String getName();
+
+ /**
+ * The configuration resources (files) to merge in configuration properties.
+ *
+ * <p>
+ * For example, would return list of [<tt>persistor.properties</tt>, and <tt>persistor_in-memory.properties</tt>]
+ * for the in-memory object store.
+ *
+ * <p>
+ * The implementation should look under keys prefixed either <tt>isis.persistor</tt> or
+ * <tt>isis.persistor.in-memory</tt>.
+ *
+ * <p>
+ * Note that we use an '_' underscore to join the {@link #getType() type} and {@link #getName() name} in the
+ * filenames, but a '.' (period) for the keys.
+ */
+ List<String> getConfigurationResources();
+
+ /**
+ * The (classes of) the types that this installer makes available in the {@link #getModule() module}.
+ */
+ List<Class<?>> getTypes();
}
-
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/Noop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/Noop.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/Noop.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/Noop.java Mon Apr 25 09:19:29 2011
@@ -17,20 +17,15 @@
* under the License.
*/
+package org.apache.isis.core.commons.components;
-package org.apache.isis.core.commons.components;
-
-/**
- * Marker interface for components that are no-ops.
- *
- * <p>
- * Originally introduced in order to support bootstrapping by
- * dependency injection frameworks; allows us to
- * specify a no-op in the configuration files which will be
- * ignored.
- */
-public interface Noop {
-
-}
-
-
+/**
+ * Marker interface for components that are no-ops.
+ *
+ * <p>
+ * Originally introduced in order to support bootstrapping by dependency injection frameworks; allows us to specify a
+ * no-op in the configuration files which will be ignored.
+ */
+public interface Noop {
+
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/Resettable.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/Resettable.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/Resettable.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/Resettable.java Mon Apr 25 09:19:29 2011
@@ -17,18 +17,17 @@
* under the License.
*/
+package org.apache.isis.core.commons.components;
-package org.apache.isis.core.commons.components;
-
-/**
- * Allows the component to be reset.
- *
- * <p>
- * Primarily for testing.
- *
- */
-public interface Resettable {
-
- void reset();
-
-}
+/**
+ * Allows the component to be reset.
+ *
+ * <p>
+ * Primarily for testing.
+ *
+ */
+public interface Resettable {
+
+ void reset();
+
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/SessionScopedComponent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/SessionScopedComponent.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/SessionScopedComponent.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/SessionScopedComponent.java Mon Apr 25 09:19:29 2011
@@ -17,30 +17,29 @@
* under the License.
*/
+package org.apache.isis.core.commons.components;
-package org.apache.isis.core.commons.components;
-
-/**
- * Indicate that the implementing component is scoped at the session level (for a single user) and
- * might also need to be "opened" or "closed" at the start/end of the session.
- *
- * <p>
- * Analogous to Hibernate's <tt>Session</tt>.
- *
- * @see ApplicationScopedComponent
- * @see TransactionScopedComponent
- */
-public interface SessionScopedComponent extends Component {
-
- /**
- * Indicates to the component that it is to initialise itself as it will soon be receiving requests.
- */
- void open();
-
- /**
- * Indicates to the component that no more requests will be made of it and it can safely release any
- * services it has hold of.
- */
- void close();
-
-}
+/**
+ * Indicate that the implementing component is scoped at the session level (for a single user) and might also need to be
+ * "opened" or "closed" at the start/end of the session.
+ *
+ * <p>
+ * Analogous to Hibernate's <tt>Session</tt>.
+ *
+ * @see ApplicationScopedComponent
+ * @see TransactionScopedComponent
+ */
+public interface SessionScopedComponent extends Component {
+
+ /**
+ * Indicates to the component that it is to initialise itself as it will soon be receiving requests.
+ */
+ void open();
+
+ /**
+ * Indicates to the component that no more requests will be made of it and it can safely release any services it has
+ * hold of.
+ */
+ void close();
+
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/TransactionScopedComponent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/TransactionScopedComponent.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/TransactionScopedComponent.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/components/TransactionScopedComponent.java Mon Apr 25 09:19:29 2011
@@ -17,23 +17,21 @@
* under the License.
*/
+package org.apache.isis.core.commons.components;
-package org.apache.isis.core.commons.components;
-
-/**
- * Indicate that the implementing component is scoped at the transaction level (within a single session).
- *
- * <p>
- * Unlike {@link ApplicationScopedComponent} and {@link SessionScopedComponent} there are not lifecycle
- * (initialization/shutdown) methods here. That is, this is strictly a marker interface.
- *
- * <p>
- * Analogous to Hibernate's <tt>Transaction</tt>.
- *
- * @see ApplicationScopedComponent
- * @see SessionScopedComponent
- */
-public interface TransactionScopedComponent extends Component {
-
-
-}
+/**
+ * Indicate that the implementing component is scoped at the transaction level (within a single session).
+ *
+ * <p>
+ * Unlike {@link ApplicationScopedComponent} and {@link SessionScopedComponent} there are not lifecycle
+ * (initialization/shutdown) methods here. That is, this is strictly a marker interface.
+ *
+ * <p>
+ * Analogous to Hibernate's <tt>Transaction</tt>.
+ *
+ * @see ApplicationScopedComponent
+ * @see SessionScopedComponent
+ */
+public interface TransactionScopedComponent extends Component {
+
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/ConfigurationConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/ConfigurationConstants.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/ConfigurationConstants.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/ConfigurationConstants.java Mon Apr 25 09:19:29 2011
@@ -17,24 +17,21 @@
* under the License.
*/
-
package org.apache.isis.core.commons.config;
public final class ConfigurationConstants {
- public static final String ROOT = "isis.";
- public static final String SHOW_EXPLORATION_OPTIONS = ROOT
- + "exploration.show";
-
- public static final String LIST_SEPARATOR = ",";
- public static final String DELIMITER = ".";
- public static final String DEFAULT_CONFIG_DIRECTORY = "config";
- public static final String WEBINF_CONFIG_DIRECTORY = "src/main/webapp/WEB-INF";
-
- public static final String DEFAULT_CONFIG_FILE = "isis.properties";
- public static final String WEB_CONFIG_FILE = "web.properties";
-
- private ConfigurationConstants() {
- }
-}
+ public static final String ROOT = "isis.";
+ public static final String SHOW_EXPLORATION_OPTIONS = ROOT + "exploration.show";
+
+ public static final String LIST_SEPARATOR = ",";
+ public static final String DELIMITER = ".";
+ public static final String DEFAULT_CONFIG_DIRECTORY = "config";
+ public static final String WEBINF_CONFIG_DIRECTORY = "src/main/webapp/WEB-INF";
+ public static final String DEFAULT_CONFIG_FILE = "isis.properties";
+ public static final String WEB_CONFIG_FILE = "web.properties";
+
+ private ConfigurationConstants() {
+ }
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/InstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/InstallerAbstract.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/InstallerAbstract.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/InstallerAbstract.java Mon Apr 25 09:19:29 2011
@@ -17,169 +17,154 @@
* under the License.
*/
+package org.apache.isis.core.commons.config;
-package org.apache.isis.core.commons.config;
-
import java.util.Collections;
import java.util.List;
import org.apache.isis.core.commons.components.Installer;
import com.google.inject.internal.Lists;
-
-public abstract class InstallerAbstract implements Installer,
- IsisConfigurationBuilderAware {
-
- private final String type;
- private final String name;
-
- private IsisConfigurationBuilder isisConfigurationBuilder;
- private IsisConfiguration configuration;
-
- /**
- * Subclasses should pass in the type defined as a constant in the
- * subinterface of Installer.
- *
- * <p>
- * For example, <tt>PersistenceMechanismInstaller</tt> has a constant
- * <tt>PersistenceMechanismInstaller#TYPE</tt>. Any implementation of
- * <tt>PersistenceMechanismInstaller</tt> should pass this constant value up
- * to this constructor.
- */
- public InstallerAbstract(final String type, final String name) {
- this.type = type;
- this.name = name;
- }
-
- @Override
- public String getType() {
- return type;
- }
-
-
- @Override
- public String getName() {
- return name;
- }
-
- /**
- * Returns <tt>[type.properties, type_name.properties</tt>.
- *
- * <p>
- * For example, <tt>[persistor.properties, persistor_in-memory.properties]</tt>.
- *
- * @see #getType()
- * @see #getName()
- */
- @Override
- public List<String> getConfigurationResources() {
- final List<String> resourceList = Lists.newArrayList();
- final String componentFile = getType() + ".properties";
- resourceList.add(componentFile);
- final String componentImplementationFile = getType() + "_" + getName() + ".properties";
- resourceList.add(componentImplementationFile);
- addConfigurationResources(resourceList);
- return Collections.unmodifiableList(resourceList);
- }
-
- /**
- * Optional hook method to allow subclasses to specify any additional config resources.
- */
- protected void addConfigurationResources(List<String> configurationResources) {
- }
-
- //////////////////////////////////////////////////////
- // init, shutdown
- //////////////////////////////////////////////////////
-
- /**
- * Default implementation does nothing.
- */
- @Override
- public void init() {
- // no-op implementation, subclasses may override!
- }
-
- /**
- * Default implementation does nothing.
- */
- @Override
- public void shutdown() {
- // no-op implementation, subclasses may override!
- }
-
-
- /**
- * Either this method or {@link #setConfiguration(IsisConfiguration)}
- * should be called prior to calling {@link #getConfiguration()}.
- *
- * <p>
- * If a {@link #setConfiguration(IsisConfiguration) configuration}
- * has already been provided, then throws {@link IllegalStateException}.
- */
- @Override
- public void setConfigurationBuilder(
- IsisConfigurationBuilder isisConfigurationBuilder) {
- if (configuration != null) {
- throw new IllegalStateException(
- "A IsisConfiguration has already been provided.");
- }
- this.isisConfigurationBuilder = isisConfigurationBuilder;
- }
-
- /**
- * Either this method or
- * {@link #setConfigurationBuilder(IsisConfigurationBuilder)} should be called
- * prior to calling {@link #getConfiguration()}.
- *
- * <p>
- * If a {@link #setConfigurationBuilder(IsisConfigurationBuilder) configuration
- * builder} has already been provided, then throws
- * {@link IllegalStateException}.
- */
- public void setConfiguration(IsisConfiguration configuration) {
- if (isisConfigurationBuilder != null) {
- throw new IllegalStateException(
- "A IsisConfiguration has already been provided.");
- }
- this.configuration = configuration;
- }
-
- /**
- * Returns a <i>snapshot</i> of the current configuration provided by the
- * {@link #setConfigurationBuilder(IsisConfigurationBuilder) injected}
- * {@link IsisConfigurationBuilder}.
- *
- * <p>
- * Implementation note: the implementation is in fact just
- * {@link InstallerLookupDefault}.
- */
- public IsisConfiguration getConfiguration() {
- if (isisConfigurationBuilder != null) {
- return isisConfigurationBuilder.getConfiguration();
- } else if (configuration != null) {
- return configuration;
- } else {
- throw new IllegalStateException(
- "Neither a ConfigurationBuilder nor Configuration has not been provided");
- }
- }
-
- /**
- * Helper for subclasses implementing {@link #getTypes()}.
- */
- protected static List<Class<?>> listOf(final Class<?>... classes) {
- return Collections.unmodifiableList(Lists.<Class<?>>newArrayList(classes));
- }
-
- /**
- * Helper for subclasses implementing {@link #getTypes()}.
- */
- protected static List<Class<?>> listOf(List<Class<?>> classList, final Class<?>... classes) {
- List<Class<?>> arrayList = Lists.<Class<?>>newArrayList(classes);
- arrayList.addAll(0, classList);
- return Collections.unmodifiableList(arrayList);
- }
-
-}
-
+
+public abstract class InstallerAbstract implements Installer, IsisConfigurationBuilderAware {
+
+ private final String type;
+ private final String name;
+
+ private IsisConfigurationBuilder isisConfigurationBuilder;
+ private IsisConfiguration configuration;
+
+ /**
+ * Subclasses should pass in the type defined as a constant in the subinterface of Installer.
+ *
+ * <p>
+ * For example, <tt>PersistenceMechanismInstaller</tt> has a constant <tt>PersistenceMechanismInstaller#TYPE</tt>.
+ * Any implementation of <tt>PersistenceMechanismInstaller</tt> should pass this constant value up to this
+ * constructor.
+ */
+ public InstallerAbstract(final String type, final String name) {
+ this.type = type;
+ this.name = name;
+ }
+
+ @Override
+ public String getType() {
+ return type;
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Returns <tt>[type.properties, type_name.properties</tt>.
+ *
+ * <p>
+ * For example, <tt>[persistor.properties, persistor_in-memory.properties]</tt>.
+ *
+ * @see #getType()
+ * @see #getName()
+ */
+ @Override
+ public List<String> getConfigurationResources() {
+ final List<String> resourceList = Lists.newArrayList();
+ final String componentFile = getType() + ".properties";
+ resourceList.add(componentFile);
+ final String componentImplementationFile = getType() + "_" + getName() + ".properties";
+ resourceList.add(componentImplementationFile);
+ addConfigurationResources(resourceList);
+ return Collections.unmodifiableList(resourceList);
+ }
+
+ /**
+ * Optional hook method to allow subclasses to specify any additional config resources.
+ */
+ protected void addConfigurationResources(final List<String> configurationResources) {
+ }
+
+ // ////////////////////////////////////////////////////
+ // init, shutdown
+ // ////////////////////////////////////////////////////
+
+ /**
+ * Default implementation does nothing.
+ */
+ @Override
+ public void init() {
+ // no-op implementation, subclasses may override!
+ }
+
+ /**
+ * Default implementation does nothing.
+ */
+ @Override
+ public void shutdown() {
+ // no-op implementation, subclasses may override!
+ }
+
+ /**
+ * Either this method or {@link #setConfiguration(IsisConfiguration)} should be called prior to calling
+ * {@link #getConfiguration()}.
+ *
+ * <p>
+ * If a {@link #setConfiguration(IsisConfiguration) configuration} has already been provided, then throws
+ * {@link IllegalStateException}.
+ */
+ @Override
+ public void setConfigurationBuilder(final IsisConfigurationBuilder isisConfigurationBuilder) {
+ if (configuration != null) {
+ throw new IllegalStateException("A IsisConfiguration has already been provided.");
+ }
+ this.isisConfigurationBuilder = isisConfigurationBuilder;
+ }
+
+ /**
+ * Either this method or {@link #setConfigurationBuilder(IsisConfigurationBuilder)} should be called prior to
+ * calling {@link #getConfiguration()}.
+ *
+ * <p>
+ * If a {@link #setConfigurationBuilder(IsisConfigurationBuilder) configuration builder} has already been provided,
+ * then throws {@link IllegalStateException}.
+ */
+ public void setConfiguration(final IsisConfiguration configuration) {
+ if (isisConfigurationBuilder != null) {
+ throw new IllegalStateException("A IsisConfiguration has already been provided.");
+ }
+ this.configuration = configuration;
+ }
+
+ /**
+ * Returns a <i>snapshot</i> of the current configuration provided by the
+ * {@link #setConfigurationBuilder(IsisConfigurationBuilder) injected} {@link IsisConfigurationBuilder}.
+ *
+ * <p>
+ * Implementation note: the implementation is in fact just {@link InstallerLookupDefault}.
+ */
+ public IsisConfiguration getConfiguration() {
+ if (isisConfigurationBuilder != null) {
+ return isisConfigurationBuilder.getConfiguration();
+ } else if (configuration != null) {
+ return configuration;
+ } else {
+ throw new IllegalStateException("Neither a ConfigurationBuilder nor Configuration has not been provided");
+ }
+ }
+
+ /**
+ * Helper for subclasses implementing {@link #getTypes()}.
+ */
+ protected static List<Class<?>> listOf(final Class<?>... classes) {
+ return Collections.unmodifiableList(Lists.<Class<?>> newArrayList(classes));
+ }
+
+ /**
+ * Helper for subclasses implementing {@link #getTypes()}.
+ */
+ protected static List<Class<?>> listOf(final List<Class<?>> classList, final Class<?>... classes) {
+ final List<Class<?>> arrayList = Lists.<Class<?>> newArrayList(classes);
+ arrayList.addAll(0, classList);
+ return Collections.unmodifiableList(arrayList);
+ }
+
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfiguration.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfiguration.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfiguration.java Mon Apr 25 09:19:29 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.commons.config;
-package org.apache.isis.core.commons.config;
-
import java.awt.Color;
import java.awt.Font;
import java.util.Iterator;
@@ -27,156 +26,149 @@ import java.util.Iterator;
import org.apache.isis.core.commons.components.Injectable;
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.commons.resource.ResourceStreamSource;
-
-
-/**
- * Immutable set of properties representing the configuration of the running system.
- *
- * <p>
- * The {@link IsisConfiguration} is one part of a mutable/immutable pair pattern
- * (cf {@link String} and {@link StringBuilder}). What this means is, as components are
- * loaded they can discover their own configuration resources. These are added
- * to {@link IsisConfigurationBuilder}.
- *
- * <p>
- * Thus the {@link IsisConfiguration} held by different components may vary,
- * but with each being a possible superset of the previous.
- */
-public interface IsisConfiguration extends DebuggableWithTitle, Injectable, Iterable<String> {
-
- /**
- * Creates a new IsisConfiguration containing the properties starting with the specified prefix.
- * The names of the new properties will have the prefixed stripped. This is similar to the
- * {@link #getProperties(String)} method, except the property names have their prefixes removed.
- *
- * @see #getProperties(String)
- */
- IsisConfiguration createSubset(String prefix);
-
- /**
- * Gets the boolean value for the specified name where no value or 'on' will result in true being
- * returned; anything gives false. If no boolean property is specified with this name then false is
- * returned.
- *
- * @param name
- * the property name
- */
- boolean getBoolean(String name);
-
- /**
- * Gets the boolean value for the specified name. If no property is specified with this name then the
- * specified default boolean value is returned.
- *
- * @param name
- * the property name
- * @param defaultValue
- * the value to use as a default
- */
- boolean getBoolean(String name, boolean defaultValue);
-
- /**
- * Gets the color for the specified name. If no color property is specified with this name then null is
- * returned.
- *
- * @param name
- * the property name
- */
- Color getColor(String name);
-
- /**
- * Gets the color for the specified name. If no color property is specified with this name then the
- * specified default color is returned.
- *
- * @param name
- * the property name
- * @param defaultValue
- * the value to use as a default
- */
- Color getColor(String name, Color defaultValue);
-
- /**
- * Gets the font for the specified name. If no font property is specified with this name then null is
- * returned.
- *
- * @param name
- * the property name
- */
- Font getFont(String name);
-
- /**
- * Gets the font for the specified name. If no font property is specified with this name then the
- * specified default font is returned.
- *
- * @param name
- * the property name
- * @param defaultValue
- * the color to use as a default
- */
- Font getFont(String name, Font defaultValue);
-
- /**
- * Returns a list of entries for the single configuration property with the specified name.
- *
- * <p>
- * If there is no matching property then returns an empty array.
- */
- String[] getList(String name);
-
- /**
- * Gets the number value for the specified name. If no property is specified with this name then 0 is
- * returned.
- *
- * @param name
- * the property name
- */
- int getInteger(String name);
-
- /**
- * Gets the number value for the specified name. If no property is specified with this name then the
- * specified default number value is returned.
- *
- * @param name
- * the property name
- * @param defaultValue
- * the value to use as a default
- */
- int getInteger(String name, int defaultValue);
-
- /**
- * Creates a new IsisConfiguration containing the properties starting with the specified prefix.
- * The names of the properties in the copy are the same as in the original, ie the prefix is not removed.
- * This is similar to the {@link #createSubset(String)} method except the names of the properties are not
- * altered when copied.
- *
- * @see #createSubset(String)
- */
- IsisConfiguration getProperties(String withPrefix);
-
- /**
- * Returns the configuration property with the specified name. If there is no matching property then null
- * is returned.
- */
- String getString(String name);
-
- String getString(String name, String defaultValue);
-
- boolean hasProperty(String name);
-
- boolean isEmpty();
+
+/**
+ * Immutable set of properties representing the configuration of the running system.
+ *
+ * <p>
+ * The {@link IsisConfiguration} is one part of a mutable/immutable pair pattern (cf {@link String} and
+ * {@link StringBuilder}). What this means is, as components are loaded they can discover their own configuration
+ * resources. These are added to {@link IsisConfigurationBuilder}.
+ *
+ * <p>
+ * Thus the {@link IsisConfiguration} held by different components may vary, but with each being a possible superset of
+ * the previous.
+ */
+public interface IsisConfiguration extends DebuggableWithTitle, Injectable, Iterable<String> {
+
+ /**
+ * Creates a new IsisConfiguration containing the properties starting with the specified prefix. The names of the
+ * new properties will have the prefixed stripped. This is similar to the {@link #getProperties(String)} method,
+ * except the property names have their prefixes removed.
+ *
+ * @see #getProperties(String)
+ */
+ IsisConfiguration createSubset(String prefix);
+
+ /**
+ * Gets the boolean value for the specified name where no value or 'on' will result in true being returned; anything
+ * gives false. If no boolean property is specified with this name then false is returned.
+ *
+ * @param name
+ * the property name
+ */
+ boolean getBoolean(String name);
+
+ /**
+ * Gets the boolean value for the specified name. If no property is specified with this name then the specified
+ * default boolean value is returned.
+ *
+ * @param name
+ * the property name
+ * @param defaultValue
+ * the value to use as a default
+ */
+ boolean getBoolean(String name, boolean defaultValue);
+
+ /**
+ * Gets the color for the specified name. If no color property is specified with this name then null is returned.
+ *
+ * @param name
+ * the property name
+ */
+ Color getColor(String name);
+
+ /**
+ * Gets the color for the specified name. If no color property is specified with this name then the specified
+ * default color is returned.
+ *
+ * @param name
+ * the property name
+ * @param defaultValue
+ * the value to use as a default
+ */
+ Color getColor(String name, Color defaultValue);
+
+ /**
+ * Gets the font for the specified name. If no font property is specified with this name then null is returned.
+ *
+ * @param name
+ * the property name
+ */
+ Font getFont(String name);
+
+ /**
+ * Gets the font for the specified name. If no font property is specified with this name then the specified default
+ * font is returned.
+ *
+ * @param name
+ * the property name
+ * @param defaultValue
+ * the color to use as a default
+ */
+ Font getFont(String name, Font defaultValue);
+
+ /**
+ * Returns a list of entries for the single configuration property with the specified name.
+ *
+ * <p>
+ * If there is no matching property then returns an empty array.
+ */
+ String[] getList(String name);
+
+ /**
+ * Gets the number value for the specified name. If no property is specified with this name then 0 is returned.
+ *
+ * @param name
+ * the property name
+ */
+ int getInteger(String name);
+
+ /**
+ * Gets the number value for the specified name. If no property is specified with this name then the specified
+ * default number value is returned.
+ *
+ * @param name
+ * the property name
+ * @param defaultValue
+ * the value to use as a default
+ */
+ int getInteger(String name, int defaultValue);
+
+ /**
+ * Creates a new IsisConfiguration containing the properties starting with the specified prefix. The names of the
+ * properties in the copy are the same as in the original, ie the prefix is not removed. This is similar to the
+ * {@link #createSubset(String)} method except the names of the properties are not altered when copied.
+ *
+ * @see #createSubset(String)
+ */
+ IsisConfiguration getProperties(String withPrefix);
+
+ /**
+ * Returns the configuration property with the specified name. If there is no matching property then null is
+ * returned.
+ */
+ String getString(String name);
+
+ String getString(String name, String defaultValue);
+
+ boolean hasProperty(String name);
+
+ boolean isEmpty();
/**
* Iterates over the property names of this configuration.
- */
+ */
@Override
- Iterator<String> iterator();
-
- int size();
-
- /**
- * The {@link ResourceStreamSource} that was used to build this configuration.
- *
- * @see IsisConfigurationBuilder#getResourceStreamSource()
- */
- ResourceStreamSource getResourceStreamSource();
-
-}
+ Iterator<String> iterator();
+
+ int size();
+
+ /**
+ * The {@link ResourceStreamSource} that was used to build this configuration.
+ *
+ * @see IsisConfigurationBuilder#getResourceStreamSource()
+ */
+ ResourceStreamSource getResourceStreamSource();
+
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationAware.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationAware.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationAware.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationAware.java Mon Apr 25 09:19:29 2011
@@ -17,18 +17,15 @@
* under the License.
*/
+package org.apache.isis.core.commons.config;
-package org.apache.isis.core.commons.config;
-
-
-/**
- * Allows components (eg facet factories) to indicate that they have a dependency on
- * {@link IsisConfiguration}.
- */
-public interface IsisConfigurationAware {
-
- /**
- * Inject the {@link IsisConfiguration} into the component.
- */
- void setIsisConfiguration(IsisConfiguration configuration);
-}
+/**
+ * Allows components (eg facet factories) to indicate that they have a dependency on {@link IsisConfiguration}.
+ */
+public interface IsisConfigurationAware {
+
+ /**
+ * Inject the {@link IsisConfiguration} into the component.
+ */
+ void setIsisConfiguration(IsisConfiguration configuration);
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilder.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilder.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilder.java Mon Apr 25 09:19:29 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.commons.config;
import java.util.Properties;
@@ -30,32 +29,29 @@ import org.apache.isis.core.commons.reso
* Holds a mutable set of properties representing the configuration.
*
* <p>
- * Mutable/immutable pair with the {@link IsisConfiguration}. To obtain
- * the configuration, use {@link #getConfiguration()}.
+ * Mutable/immutable pair with the {@link IsisConfiguration}. To obtain the configuration, use
+ * {@link #getConfiguration()}.
*
- * @see IsisConfiguration for more details on the mutable/immutable pair
- * pattern.
+ * @see IsisConfiguration for more details on the mutable/immutable pair pattern.
*/
public interface IsisConfigurationBuilder extends Injectable {
- /**
- * Returns a currently known {@link IsisConfiguration}.
- */
+ /**
+ * Returns a currently known {@link IsisConfiguration}.
+ */
IsisConfiguration getConfiguration();
- public abstract void addConfigurationResource(final String installerName,
- final NotFoundPolicy notFoundPolicy);
+ public abstract void addConfigurationResource(final String installerName, final NotFoundPolicy notFoundPolicy);
- public abstract void add(final Properties properties);
+ public abstract void add(final Properties properties);
- public abstract void add(final String key, final String value);
+ public abstract void add(final String key, final String value);
- /**
- * The underlying {@link ResourceStreamSource} from which the configuration
- * is being read.
- *
- * <p>
- * Note that this may be a {@link ResourceStreamSourceComposite composite}.
- */
- public ResourceStreamSource getResourceStreamSource();
+ /**
+ * The underlying {@link ResourceStreamSource} from which the configuration is being read.
+ *
+ * <p>
+ * Note that this may be a {@link ResourceStreamSourceComposite composite}.
+ */
+ public ResourceStreamSource getResourceStreamSource();
}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderAware.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderAware.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderAware.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderAware.java Mon Apr 25 09:19:29 2011
@@ -17,10 +17,9 @@
* under the License.
*/
+package org.apache.isis.core.commons.config;
-package org.apache.isis.core.commons.config;
-
-public interface IsisConfigurationBuilderAware {
-
- void setConfigurationBuilder(IsisConfigurationBuilder configurationLoader);
-}
+public interface IsisConfigurationBuilderAware {
+
+ void setConfigurationBuilder(IsisConfigurationBuilder configurationLoader);
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderDefault.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderDefault.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderDefault.java Mon Apr 25 09:19:29 2011
@@ -22,13 +22,12 @@ package org.apache.isis.core.commons.con
import java.util.ArrayList;
import java.util.Arrays;
-import org.apache.log4j.Logger;
-
-import com.google.common.collect.Lists;
-
import org.apache.isis.core.commons.resource.ResourceStreamSource;
import org.apache.isis.core.commons.resource.ResourceStreamSourceContextLoaderClassPath;
import org.apache.isis.core.commons.resource.ResourceStreamSourceFileSystem;
+import org.apache.log4j.Logger;
+
+import com.google.common.collect.Lists;
/**
* Convenience implementation of {@link IsisConfigurationBuilder} that loads configuration resource as per
@@ -46,25 +45,21 @@ public class IsisConfigurationBuilderDef
super(resourceStreamSources(null));
}
- public IsisConfigurationBuilderDefault(String firstDirectory) {
+ public IsisConfigurationBuilderDefault(final String firstDirectory) {
super(resourceStreamSources(firstDirectory));
}
-
- private static ResourceStreamSource[] resourceStreamSources(String firstDirectory) {
+ private static ResourceStreamSource[] resourceStreamSources(final String firstDirectory) {
final ArrayList<ResourceStreamSource> rssList = Lists.newArrayList();
- if(firstDirectory!=null) {
+ if (firstDirectory != null) {
rssList.add(fromFileSystem(firstDirectory));
}
- rssList.addAll(
- Arrays.asList(
- fromFileSystem(ConfigurationConstants.DEFAULT_CONFIG_DIRECTORY),
- fromFileSystem(ConfigurationConstants.WEBINF_CONFIG_DIRECTORY),
- fromClassPath()));
+ rssList.addAll(Arrays.asList(fromFileSystem(ConfigurationConstants.DEFAULT_CONFIG_DIRECTORY),
+ fromFileSystem(ConfigurationConstants.WEBINF_CONFIG_DIRECTORY), fromClassPath()));
return rssList.toArray(new ResourceStreamSource[0]);
}
-
- private static ResourceStreamSource fromFileSystem(String directory) {
+
+ private static ResourceStreamSource fromFileSystem(final String directory) {
return ResourceStreamSourceFileSystem.create(directory);
}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderFileSystem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderFileSystem.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderFileSystem.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderFileSystem.java Mon Apr 25 09:19:29 2011
@@ -19,11 +19,10 @@
package org.apache.isis.core.commons.config;
-import org.apache.log4j.Logger;
-
import org.apache.isis.core.commons.resource.ResourceStreamSource;
import org.apache.isis.core.commons.resource.ResourceStreamSourceComposite;
import org.apache.isis.core.commons.resource.ResourceStreamSourceFileSystem;
+import org.apache.log4j.Logger;
/**
* Convenience implementation of {@link IsisConfigurationBuilder} that loads configuration resource from a specified
@@ -36,15 +35,15 @@ public class IsisConfigurationBuilderFil
@SuppressWarnings("unused")
private static final Logger LOG = Logger.getLogger(IsisConfigurationBuilderFileSystem.class);
- private static ResourceStreamSource createResourceStreamSource(String... directories) {
- ResourceStreamSourceComposite composite = new ResourceStreamSourceComposite();
- for (String directory : directories) {
+ private static ResourceStreamSource createResourceStreamSource(final String... directories) {
+ final ResourceStreamSourceComposite composite = new ResourceStreamSourceComposite();
+ for (final String directory : directories) {
composite.addResourceStreamSource(new ResourceStreamSourceFileSystem(directory));
}
return composite;
}
- public IsisConfigurationBuilderFileSystem(String... directories) {
+ public IsisConfigurationBuilderFileSystem(final String... directories) {
super(createResourceStreamSource(directories));
}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderPrimer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderPrimer.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderPrimer.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderPrimer.java Mon Apr 25 09:19:29 2011
@@ -17,13 +17,10 @@
* under the License.
*/
+package org.apache.isis.core.commons.config;
+
+public interface IsisConfigurationBuilderPrimer {
+
+ void primeConfigurationBuilder(IsisConfigurationBuilder isisConfigurationBuilder);
-package org.apache.isis.core.commons.config;
-
-
-public interface IsisConfigurationBuilderPrimer {
-
- void primeConfigurationBuilder(
- IsisConfigurationBuilder isisConfigurationBuilder);
-
}
\ No newline at end of file
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderResourceStreams.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderResourceStreams.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderResourceStreams.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderResourceStreams.java Mon Apr 25 09:19:29 2011
@@ -25,14 +25,13 @@ import java.util.Enumeration;
import java.util.List;
import java.util.Properties;
-import org.apache.log4j.Logger;
-
-import com.google.common.base.Objects;
-
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.resource.ResourceStreamSource;
import org.apache.isis.core.commons.resource.ResourceStreamSourceComposite;
import org.apache.isis.core.commons.resource.ResourceStreamSourceFileSystem;
+import org.apache.log4j.Logger;
+
+import com.google.common.base.Objects;
/**
* Adapter for {@link IsisConfigurationBuilder}, loading the specified configuration resource (file) from the given
@@ -49,7 +48,7 @@ public class IsisConfigurationBuilderRes
private final String configurationResource;
private final NotFoundPolicy notFoundPolicy;
- public ConfigurationResourceAndPolicy(String configurationResource, NotFoundPolicy notFoundPolicy) {
+ public ConfigurationResourceAndPolicy(final String configurationResource, final NotFoundPolicy notFoundPolicy) {
this.configurationResource = configurationResource;
this.notFoundPolicy = notFoundPolicy;
}
@@ -97,9 +96,11 @@ public class IsisConfigurationBuilderRes
}
public IsisConfigurationBuilderResourceStreams(final ResourceStreamSource... resourceStreamSources) {
- ResourceStreamSourceComposite composite = new ResourceStreamSourceComposite();
- for (ResourceStreamSource rss : resourceStreamSources) {
- if(rss==null) {continue;}
+ final ResourceStreamSourceComposite composite = new ResourceStreamSourceComposite();
+ for (final ResourceStreamSource rss : resourceStreamSources) {
+ if (rss == null) {
+ continue;
+ }
composite.addResourceStreamSource(rss);
}
this.resourceStreamSource = composite;
@@ -201,16 +202,16 @@ public class IsisConfigurationBuilderRes
return cachedConfiguration = configuration;
}
- private void loadConfigurationResources(IsisConfigurationDefault configuration) {
- for (ConfigurationResourceAndPolicy configResourceAndPolicy : configurationResources) {
+ private void loadConfigurationResources(final IsisConfigurationDefault configuration) {
+ for (final ConfigurationResourceAndPolicy configResourceAndPolicy : configurationResources) {
loadConfigurationResource(configuration, configResourceAndPolicy);
}
}
- private void loadConfigurationResource(IsisConfigurationDefault configuration,
- ConfigurationResourceAndPolicy configResourceAndPolicy) {
- String configurationResource = configResourceAndPolicy.getConfigurationResource();
- NotFoundPolicy notFoundPolicy = configResourceAndPolicy.getNotFoundPolicy();
+ private void loadConfigurationResource(final IsisConfigurationDefault configuration,
+ final ConfigurationResourceAndPolicy configResourceAndPolicy) {
+ final String configurationResource = configResourceAndPolicy.getConfigurationResource();
+ final NotFoundPolicy notFoundPolicy = configResourceAndPolicy.getNotFoundPolicy();
if (LOG.isDebugEnabled()) {
LOG.debug("loading configuration resource: " + configurationResource + ", notFoundPolicy: "
+ notFoundPolicy);
@@ -229,13 +230,14 @@ public class IsisConfigurationBuilderRes
protected void loadConfigurationResource(final IsisConfigurationDefault configuration,
final String configurationResource, final NotFoundPolicy notFoundPolicy) {
try {
- PropertiesReader propertiesReader = loadConfigurationResource(resourceStreamSource, configurationResource);
+ final PropertiesReader propertiesReader =
+ loadConfigurationResource(resourceStreamSource, configurationResource);
addProperties(configuration, propertiesReader.getProperties());
if (LOG.isInfoEnabled()) {
LOG.info("'" + configurationResource + "' FOUND");
}
return;
- } catch (IOException ex) {
+ } catch (final IOException ex) {
// keep going
}
if (notFoundPolicy == NotFoundPolicy.FAIL_FAST) {
@@ -248,28 +250,28 @@ public class IsisConfigurationBuilderRes
}
}
- private PropertiesReader loadConfigurationResource(ResourceStreamSource resourceStreamSource,
+ private PropertiesReader loadConfigurationResource(final ResourceStreamSource resourceStreamSource,
final String configurationResource) throws IOException {
return new PropertiesReader(resourceStreamSource, configurationResource);
}
- private void addShowExplorationOptionsIfNotSpecified(IsisConfigurationDefault configuration) {
+ private void addShowExplorationOptionsIfNotSpecified(final IsisConfigurationDefault configuration) {
if (configuration.getString(ConfigurationConstants.SHOW_EXPLORATION_OPTIONS) == null) {
configuration.add(ConfigurationConstants.SHOW_EXPLORATION_OPTIONS, "yes");
}
}
- private void addSystemPropertiesIfRequested(IsisConfigurationDefault configuration) {
+ private void addSystemPropertiesIfRequested(final IsisConfigurationDefault configuration) {
if (includeSystemProperties) {
addProperties(configuration, System.getProperties());
}
}
- private void addAdditionalProperties(IsisConfigurationDefault configuration) {
+ private void addAdditionalProperties(final IsisConfigurationDefault configuration) {
addProperties(configuration, additionalProperties);
}
- protected void addProperties(IsisConfigurationDefault configuration, Properties properties) {
+ protected void addProperties(final IsisConfigurationDefault configuration, final Properties properties) {
configuration.add(properties);
}
@@ -282,9 +284,9 @@ public class IsisConfigurationBuilderRes
// ////////////////////////////////////////////////////////////
@Override
- public void injectInto(Object candidate) {
+ public void injectInto(final Object candidate) {
if (IsisConfigurationBuilderAware.class.isAssignableFrom(candidate.getClass())) {
- IsisConfigurationBuilderAware cast = IsisConfigurationBuilderAware.class.cast(candidate);
+ final IsisConfigurationBuilderAware cast = IsisConfigurationBuilderAware.class.cast(candidate);
cast.setConfigurationBuilder(this);
}
}