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/27 00:38:19 UTC
svn commit: r1096936 [1/3] - in /incubator/isis/trunk:
core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ignore/
core/runtime/
core/runtime/src/main/java/org/apache/isis/core/runtime/logging/
core/src/docbkx/guide/ runtimes/dflt/ runti...
Author: danhaywood
Date: Tue Apr 26 22:38:18 2011
New Revision: 1096936
URL: http://svn.apache.org/viewvc?rev=1096936&view=rev
Log:
ISIS-22 code cleanup (core.progmodel); deleted some facets that got didn't get deleted when moved previously (facets.ignore -> facets.object.ignore); moving 'logging' package from oai.runtimes.dflt:runtime -> oai.core:runtime; slight improvements to dflt:runtime docbkx guide
Added:
incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/
incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/FileSnapshotAppender.java
- copied, changed from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/FileSnapshotAppender.java
incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/IsisLoggingConfigurer.java
- copied, changed from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/IsisLoggingConfigurer.java
incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/Logger.java
- copied, changed from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/Logger.java
incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/LoggingConstants.java
- copied, changed from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/LoggingConstants.java
incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/PopupSnapshotAppender.java
- copied, changed from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/PopupSnapshotAppender.java
incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SmtpExtendedAppender.java
- copied, changed from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SmtpExtendedAppender.java
incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SmtpSnapshotAppender.java
- copied, changed from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SmtpSnapshotAppender.java
incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SnapshotAppender.java
- copied, changed from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SnapshotAppender.java
incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SnapshotServer.java
- copied, changed from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SnapshotServer.java
incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SnapshotWriter.java
- copied, changed from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SnapshotWriter.java
incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SocketSnapshotAppender.java
- copied, changed from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SocketSnapshotAppender.java
incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/WebSnapshotAppender.java
- copied, changed from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/WebSnapshotAppender.java
incubator/isis/trunk/runtimes/dflt/runtimes-dflt-JARs.java.hsp
incubator/isis/trunk/security/dflt/src/main/java/org/apache/isis/security/dflt/authorization/AuthorizorNoop.java
- copied, changed from r1096322, incubator/isis/trunk/security/dflt/src/main/java/org/apache/isis/security/dflt/authorization/NoopAuthorizor.java
Removed:
incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/ignore/
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/FileSnapshotAppender.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/IsisLoggingConfigurer.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/Logger.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/LoggingConstants.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/PopupSnapshotAppender.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SmtpExtendedAppender.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SmtpSnapshotAppender.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SnapshotAppender.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SnapshotServer.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SnapshotWriter.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SocketSnapshotAppender.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/WebSnapshotAppender.java
incubator/isis/trunk/security/dflt/src/main/java/org/apache/isis/security/dflt/authorization/NoopAuthorizor.java
Modified:
incubator/isis/trunk/core/runtime/pom.xml
incubator/isis/trunk/core/src/docbkx/guide/isis-core.xml
incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/ServerFacadeLogger.java
incubator/isis/trunk/runtimes/dflt/runtime/pom.xml
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceMechanismInstallerAbstract.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionLogger.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/IsisStoreLogger.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/ObjectStorePersistenceMechanismInstallerAbstract.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/Constants.java
incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisRunner.java
incubator/isis/trunk/runtimes/dflt/src/docbkx/guide/isis-default-runtime.xml
incubator/isis/trunk/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/IsisWebAppBootstrapper.java
incubator/isis/trunk/security/dflt/src/main/java/org/apache/isis/security/dflt/authentication/AuthenticatorNoop.java
incubator/isis/trunk/security/dflt/src/main/java/org/apache/isis/security/dflt/authorization/NoopAuthorizationManagerInstaller.java
incubator/isis/trunk/security/file/src/main/java/org/apache/isis/security/file/authentication/FileAuthenticator.java
incubator/isis/trunk/security/file/src/main/java/org/apache/isis/security/file/authorization/FileAuthorizationConstants.java
incubator/isis/trunk/security/file/src/main/java/org/apache/isis/security/file/authorization/FileAuthorizor.java
incubator/isis/trunk/security/ldap/src/main/java/org/apache/isis/security/ldap/authorization/LdapAuthorizor.java
incubator/isis/trunk/security/src/docbkx/guide/isis-security.xml
incubator/isis/trunk/src/site/apt/documentation.apt
incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugDumpSnapshotOption.java
Modified: incubator/isis/trunk/core/runtime/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/pom.xml?rev=1096936&r1=1096935&r2=1096936&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/pom.xml (original)
+++ incubator/isis/trunk/core/runtime/pom.xml Tue Apr 26 22:38:18 2011
@@ -54,6 +54,16 @@
<artifactId>testsupport</artifactId>
<scope>test</scope>
</dependency>
+
+
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.1</version>
+ <optional>true</optional>
+ <scope>provided</scope> <!-- Used by log4j extended appended, and provided by log4j -->
+ </dependency>
+
</dependencies>
</project>
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/FileSnapshotAppender.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/FileSnapshotAppender.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/FileSnapshotAppender.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/FileSnapshotAppender.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/FileSnapshotAppender.java&r1=1096322&r2=1096936&rev=1096936&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/FileSnapshotAppender.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/FileSnapshotAppender.java Tue Apr 26 22:38:18 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.logging;
+package org.apache.isis.core.runtime.logging;
import java.io.FileNotFoundException;
import java.io.IOException;
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/IsisLoggingConfigurer.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/IsisLoggingConfigurer.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/IsisLoggingConfigurer.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/IsisLoggingConfigurer.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/IsisLoggingConfigurer.java&r1=1096322&r2=1096936&rev=1096936&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/IsisLoggingConfigurer.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/IsisLoggingConfigurer.java Tue Apr 26 22:38:18 2011
@@ -18,24 +18,22 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.logging;
+package org.apache.isis.core.runtime.logging;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-import org.apache.log4j.Appender;
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Layout;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
-import org.apache.log4j.PropertyConfigurator;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
import org.apache.isis.core.commons.lang.IoUtils;
-import org.apache.isis.runtimes.dflt.runtime.runner.Constants;
+import org.apache.log4j.Appender;
+import org.apache.log4j.BasicConfigurator;
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Layout;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PatternLayout;
+import org.apache.log4j.PropertyConfigurator;
public class IsisLoggingConfigurer {
@@ -118,13 +116,13 @@ public class IsisLoggingConfigurer {
private static Level loggingLevel(final String[] args) {
Level level = null;
for (int i = 0; i < args.length; i++) {
- if (args[i].equals("-" + Constants.DEBUG_OPT)) {
+ if (args[i].equals("-" + LoggingConstants.DEBUG_OPT)) {
level = Level.DEBUG;
break;
- } else if (args[i].equals("-" + Constants.QUIET_OPT)) {
+ } else if (args[i].equals("-" + LoggingConstants.QUIET_OPT)) {
level = Level.ERROR;
break;
- } else if (args[i].equals("-" + Constants.VERBOSE_OPT)) {
+ } else if (args[i].equals("-" + LoggingConstants.VERBOSE_OPT)) {
level = Level.INFO;
break;
}
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/Logger.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/Logger.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/Logger.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/Logger.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/Logger.java&r1=1096322&r2=1096936&rev=1096936&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/Logger.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/Logger.java Tue Apr 26 22:38:18 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.logging;
+package org.apache.isis.core.runtime.logging;
import org.apache.log4j.Level;
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/LoggingConstants.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/LoggingConstants.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/LoggingConstants.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/LoggingConstants.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/LoggingConstants.java&r1=1096322&r2=1096936&rev=1096936&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/LoggingConstants.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/LoggingConstants.java Tue Apr 26 22:38:18 2011
@@ -18,11 +18,15 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.logging;
+package org.apache.isis.core.runtime.logging;
public final class LoggingConstants {
public static final String LOGGING_CONFIG_FILE = "logging.properties";
+
+ public static final String DEBUG_OPT = "debug";
+ public static final String VERBOSE_OPT = "verbose";
+ public static final String QUIET_OPT = "quiet";
private LoggingConstants() {}
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/PopupSnapshotAppender.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/PopupSnapshotAppender.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/PopupSnapshotAppender.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/PopupSnapshotAppender.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/PopupSnapshotAppender.java&r1=1096322&r2=1096936&rev=1096936&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/PopupSnapshotAppender.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/PopupSnapshotAppender.java Tue Apr 26 22:38:18 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.logging;
+package org.apache.isis.core.runtime.logging;
import java.awt.BorderLayout;
import java.awt.Button;
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SmtpExtendedAppender.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SmtpExtendedAppender.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SmtpExtendedAppender.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SmtpExtendedAppender.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SmtpExtendedAppender.java&r1=1096322&r2=1096936&rev=1096936&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SmtpExtendedAppender.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SmtpExtendedAppender.java Tue Apr 26 22:38:18 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimes.dflt.runtime.logging;
+package org.apache.isis.core.runtime.logging;
import java.io.UnsupportedEncodingException;
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SmtpSnapshotAppender.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SmtpSnapshotAppender.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SmtpSnapshotAppender.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SmtpSnapshotAppender.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SmtpSnapshotAppender.java&r1=1096322&r2=1096936&rev=1096936&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SmtpSnapshotAppender.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SmtpSnapshotAppender.java Tue Apr 26 22:38:18 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.logging;
+package org.apache.isis.core.runtime.logging;
import java.io.BufferedReader;
import java.io.BufferedWriter;
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SnapshotAppender.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SnapshotAppender.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SnapshotAppender.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SnapshotAppender.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SnapshotAppender.java&r1=1096322&r2=1096936&rev=1096936&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SnapshotAppender.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SnapshotAppender.java Tue Apr 26 22:38:18 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.logging;
+package org.apache.isis.core.runtime.logging;
import java.util.Date;
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SnapshotServer.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SnapshotServer.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SnapshotServer.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SnapshotServer.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SnapshotServer.java&r1=1096322&r2=1096936&rev=1096936&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SnapshotServer.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SnapshotServer.java Tue Apr 26 22:38:18 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.logging;
+package org.apache.isis.core.runtime.logging;
import java.io.BufferedReader;
import java.io.FileInputStream;
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SnapshotWriter.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SnapshotWriter.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SnapshotWriter.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SnapshotWriter.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SnapshotWriter.java&r1=1096322&r2=1096936&rev=1096936&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SnapshotWriter.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SnapshotWriter.java Tue Apr 26 22:38:18 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.logging;
+package org.apache.isis.core.runtime.logging;
import java.io.File;
import java.io.FileOutputStream;
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SocketSnapshotAppender.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SocketSnapshotAppender.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SocketSnapshotAppender.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SocketSnapshotAppender.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SocketSnapshotAppender.java&r1=1096322&r2=1096936&rev=1096936&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/SocketSnapshotAppender.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/SocketSnapshotAppender.java Tue Apr 26 22:38:18 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.logging;
+package org.apache.isis.core.runtime.logging;
import java.io.BufferedWriter;
import java.io.OutputStreamWriter;
Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/WebSnapshotAppender.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/WebSnapshotAppender.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/WebSnapshotAppender.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/WebSnapshotAppender.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/WebSnapshotAppender.java&r1=1096322&r2=1096936&rev=1096936&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/logging/WebSnapshotAppender.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/WebSnapshotAppender.java Tue Apr 26 22:38:18 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtimes.dflt.runtime.logging;
+package org.apache.isis.core.runtime.logging;
import java.io.IOException;
import java.io.InputStream;
Modified: incubator/isis/trunk/core/src/docbkx/guide/isis-core.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/src/docbkx/guide/isis-core.xml?rev=1096936&r1=1096935&r2=1096936&view=diff
==============================================================================
--- incubator/isis/trunk/core/src/docbkx/guide/isis-core.xml (original)
+++ incubator/isis/trunk/core/src/docbkx/guide/isis-core.xml Tue Apr 26 22:38:18 2011
@@ -2553,6 +2553,292 @@ Element customerAsXml = snapshot.toXml()
}
}</programlisting>
</sect1>
+
+ <sect1>
+ <title>Logging Support</title>
+
+ <sect2>
+ <title>Snapshot appenders</title>
+
+ <para>The framework provides a number of appenders that create a
+ snapshot of the recently logged events instead of capturing all events
+ since the system started. The benefits here are twofold. First,
+ writing to the appenders is minimised as they are only written when
+ errors occur or the user demands it. Second, the partial log can be
+ automatically sent over the network to someone who needs to know when
+ things have gone wrong.</para>
+
+ <para>All the snapshot appends support the same basic
+ properties:-</para>
+
+ <itemizedlist>
+ <listitem>
+ <para><emphasis> <methodname>addInfo</methodname>
+ </emphasis></para>
+
+ <para>(boolean) indicates whether to prepend details about the
+ machine, os and Java to log, eg</para>
+
+ <programlisting format="linespecific">Snapshot:- Thu Dec 01 14:34:24 GMT 2005
+ R Matthews
+ Windows XP (x86) 5.1
+ Java HotSpot(TM) Client VM 1.4.2_04-b05
+ Version 000000</programlisting>
+ </listitem>
+
+ <listitem>
+ <para><emphasis> <methodname>bufferSize</methodname>
+ </emphasis></para>
+
+ <para>(integer) the number of events to write out to the snapshot.
+ Defaults to 512 events.</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis> <methodname>locationInfo</methodname>
+ </emphasis></para>
+
+ <para>(boolean) whether to capture the details of where in the
+ code the event was generated. Note - capturing this information
+ can be quite expensive.</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis> <methodname>evaluatorClass</methodname>
+ </emphasis></para>
+
+ <para>(<classname>org.apache.log4j.spi.TriggeringEventEvaluator</classname>)
+ a trigger that determines when a snapshot should be created. The
+ trigger object is given each event that is logged and flags when
+ to produce a snapsho.</para>
+
+ <para>When not trigger is specified a default trigger is applied
+ that triggers a snapshot when an event of level ERROR or FATAL
+ occurs.</para>
+ </listitem>
+ </itemizedlist>
+
+ <sect3>
+ <title>File snapshot appender</title>
+
+ <para>The <classname>FileSnapshotAppender</classname> writes the
+ snapshot to timestamped file. The following properties can be
+ specified:-</para>
+
+ <itemizedlist>
+ <listitem>
+ <para><emphasis><methodname>directory</methodname></emphasis></para>
+
+ <para>The directory path where the files are to be created. If
+ none is specified then the working directory will be
+ used.</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis><methodname>extension</methodname></emphasis></para>
+
+ <para>The extension type to append to the file name.</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis><methodname>fileName</methodname></emphasis></para>
+
+ <para>The base name of the log file, which will have timestamp
+ appended. Defaults to 'log-snapshot-'.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>The following example writes xml snapshots to the logs
+ directory to files ending with '.xml'.</para>
+
+ <programlisting format="linespecific">log4j.appender.Snapshot=org.apache.isis.utility.logging.FileSnapshotAppender
+log4j.appender.Snapshot.bufferSize=1024
+log4j.appender.Snapshot.addInfo=true
+log4j.appender.Snapshot.locationInfo=true
+log4j.appender.Snapshot.directory=logs
+log4j.appender.Snapshot.extension=xml
+log4j.appender.Snapshot.layout=org.apache.log4j.xml.XMLLayout</programlisting>
+ </sect3>
+
+ <sect3>
+ <title>Popup snapshot appender</title>
+
+ <para>The <classname>PopupSnapshotAppender</classname> displays a
+ popup dialog showing the snapshot. Do not use this on a server as
+ there will be no one sitting in front of it to see it. It has no
+ properties so its configuration is short.</para>
+
+ <programlisting format="linespecific">log4j.appender.Popup=org.apache.isis.utility.logging.PopupSnapshotAppender
+log4j.appender.Popup.layout=org.apache.log4j.PatternLayout
+log4j.appender.Popup.layout.ConversionPattern=%-5r [%-20c{1} %-10t %-5p] %m%n
+</programlisting>
+ </sect3>
+
+ <sect3>
+ <title>Email snapshot appender</title>
+
+ <para>The <classname>SmtpSnapshotAppender</classname> generates an
+ email with the snapshot in it and sends it to a specified recipient.
+ The following properties can be specified:-</para>
+
+ <itemizedlist>
+ <listitem>
+ <para><emphasis><methodname>server</methodname></emphasis></para>
+
+ <para>Address of the email server</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis><methodname>port</methodname></emphasis></para>
+
+ <para>The port the server listen on for SMTP requests. Defaults
+ to port 25.</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis><methodname>recipient</methodname></emphasis></para>
+
+ <para>Email address to send the snapshot to.</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis><methodname>domain</methodname></emphasis></para>
+
+ <para>The address that client connects to the server with. Some
+ email servers validate the sender's address in the MAIL FROM
+ command so you may need to specify a real address here.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>The following example sends a short HTML snapshot logs to
+ logs@support.acme.com, via the email server at my.emailserver.com
+ using port 25.</para>
+
+ <programlisting format="linespecific">log4j.appender.EmailSnapshot=org.apache.isis.utility.logging.SmtpSnapshotAppender
+log4j.appender.EmailSnapshot.bufferSize=50
+log4j.appender.EmailSnapshot.addInfo=true
+log4j.appender.EmailSnapshot.server=my.emailserver.com
+log4j.appender.EmailSnapshot.port=25
+log4j.appender.EmailSnapshot.recipient=logs@support.acme.com
+log4j.appender.EmailSnapshot.layout=org.apache.log4j.HTMLLayout</programlisting>
+ </sect3>
+
+ <sect3>
+ <title>Socket snapshot appender</title>
+
+ <para>The <classname>SocketSnapshotAppender</classname> establishes
+ a socket connection to a server and passes across the the snapshot.
+ This is designed to be used with
+ <classname>SnapshotServer</classname>, which collects collects
+ snapshots from multiple clients.</para>
+
+ <para>The following example sends an XML snapshot to a server on a
+ private network.</para>
+
+ <programlisting format="linespecific">log4j.appender.SocketSnapshot=org.apache.isis.utility.logging.SocketSnapshotAppender
+log4j.appender.SocketSnapshot.bufferSize=1024
+log4j.appender.SocketSnapshot.addInfo=true
+log4j.appender.SocketSnapshot.server=191.168.1.1
+log4j.appender.SocketSnapshot.port=12345
+log4j.appender.SocketSnapshot.layout=org.apache.log4j.xml.XMLLayout</programlisting>
+
+ <para>The snaphot server should be directed to a maching running the
+ server. The server is run using the following command:</para>
+
+ <screen format="linespecific">java -cp isis.jar org.apache.isis.utility.logging.SnapshotServer</screen>
+
+ <para>The server needs a properties file with the following
+ properties defined (with the prefix
+ <methodname>isis.snapshotserver.</methodname>):-</para>
+
+ <itemizedlist>
+ <listitem>
+ <para><emphasis><methodname>server</methodname></emphasis></para>
+
+ <para>Address of the server.</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis><methodname>port</methodname></emphasis></para>
+
+ <para>The port the server listens on for logging requests.
+ Defaults to port 9289.</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis><methodname>directory</methodname></emphasis></para>
+
+ <para>The directory path where the transferred files are to be
+ saved. If none is specified then the working directory will be
+ used.</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis><methodname>fileName</methodname></emphasis></para>
+
+ <para>The base name of the log file, which will have timestamp
+ appended. Defaults to 'log-snapshot-'.</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis><methodname>extension</methodname></emphasis></para>
+
+ <para>The extension type to append to the file name.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>An example configuration would be:-</para>
+
+ <programlisting format="linespecific">isis.snapshotserver.port=12345
+isis.snapshotserver.directory=logs
+isis.snapshotserver.filename=log
+isis.snapshotserver.extension=xml</programlisting>
+ </sect3>
+
+ <sect3>
+ <title>Web snapshot appender</title>
+
+ <para>The <classname>WebSnapshotAppender</classname> sends the
+ snapshot to a web server. The following properties can be
+ specified:-</para>
+
+ <itemizedlist>
+ <listitem>
+ <para><emphasis><methodname>url</methodname></emphasis></para>
+
+ <para>URL of server to post data to (including the protocol
+ 'http').</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis><methodname>proxyAddress</methodname></emphasis></para>
+
+ <para>Address of web proxy if one is being used.</para>
+ </listitem>
+
+ <listitem>
+ <para><emphasis><methodname>proxyPort</methodname></emphasis></para>
+
+ <para>Port of proxy server.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>The following example sends a default length snapshot to the
+ webserver.</para>
+
+ <programlisting format="linespecific">log4j.appender.Remote=org.apache.isis.utility.logging.WebSnapshotAppender
+log4j.appender.Remote.addInfo=true
+log4j.appender.Remote.locationInfo=true
+log4j.appender.Remote.url=http://192.168.1.3/support/test.php
+log4j.appender.Remote.layout=org.apache.log4j.HTMLLayout</programlisting>
+
+ <para>This appender use the HTTP POST method to upload the data. It
+ passes up a message and the snapshot as two parameters to the
+ request: <varname>error</varname> and
+ <varname>trace</varname>.</para>
+ </sect3>
+ </sect2>
+ </sect1>
</chapter>
<chapter>
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/ServerFacadeLogger.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/ServerFacadeLogger.java?rev=1096936&r1=1096935&r2=1096936&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/ServerFacadeLogger.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/ServerFacadeLogger.java Tue Apr 26 22:38:18 2011
@@ -73,8 +73,8 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.spec.ActionType;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.runtime.logging.Logger;
import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
-import org.apache.isis.runtimes.dflt.runtime.logging.Logger;
import com.google.inject.internal.Lists;
Modified: incubator/isis/trunk/runtimes/dflt/runtime/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/pom.xml?rev=1096936&r1=1096935&r2=1096936&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/pom.xml (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/pom.xml Tue Apr 26 22:38:18 2011
@@ -121,13 +121,5 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4.1</version>
- <optional>true</optional>
- <scope>provided</scope> <!-- Used by log4j extended appended, and provided by log4j -->
- </dependency>
-
</dependencies>
</project>
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceMechanismInstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceMechanismInstallerAbstract.java?rev=1096936&r1=1096935&r2=1096936&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceMechanismInstallerAbstract.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceMechanismInstallerAbstract.java Tue Apr 26 22:38:18 2011
@@ -57,7 +57,7 @@ import org.apache.isis.runtimes.dflt.run
public abstract class PersistenceMechanismInstallerAbstract extends InstallerAbstract implements
PersistenceMechanismInstaller, InstallerLookupAware {
- private static final String LOGGING_PROPERTY = org.apache.isis.runtimes.dflt.runtime.logging.Logger.PROPERTY_ROOT
+ private static final String LOGGING_PROPERTY = org.apache.isis.core.runtime.logging.Logger.PROPERTY_ROOT
+ "persistenceSession";
private static final Logger LOG = Logger.getLogger(PersistenceMechanismInstallerAbstract.class);
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionLogger.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionLogger.java?rev=1096936&r1=1096935&r2=1096936&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionLogger.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistenceSessionLogger.java Tue Apr 26 22:38:18 2011
@@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.se
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.runtimes.dflt.runtime.logging.Logger;
+import org.apache.isis.core.runtime.logging.Logger;
import org.apache.isis.runtimes.dflt.runtime.persistence.adapterfactory.AdapterFactory;
import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.AdapterManager;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectfactory.ObjectFactory;
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/IsisStoreLogger.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/IsisStoreLogger.java?rev=1096936&r1=1096935&r2=1096936&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/IsisStoreLogger.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/IsisStoreLogger.java Tue Apr 26 22:38:18 2011
@@ -29,7 +29,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.runtimes.dflt.runtime.logging.Logger;
+import org.apache.isis.core.runtime.logging.Logger;
import org.apache.isis.runtimes.dflt.runtime.persistence.ObjectNotFoundException;
import org.apache.isis.runtimes.dflt.runtime.persistence.UnsupportedFindException;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.CreateObjectCommand;
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/ObjectStorePersistenceMechanismInstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/ObjectStorePersistenceMechanismInstallerAbstract.java?rev=1096936&r1=1096935&r2=1096936&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/ObjectStorePersistenceMechanismInstallerAbstract.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/ObjectStorePersistenceMechanismInstallerAbstract.java Tue Apr 26 22:38:18 2011
@@ -27,7 +27,7 @@ import static org.apache.isis.core.commo
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.runtimes.dflt.runtime.logging.Logger;
+import org.apache.isis.core.runtime.logging.Logger;
import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceMechanismInstallerAbstract;
import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSession;
import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSessionFactory;
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/Constants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/Constants.java?rev=1096936&r1=1096935&r2=1096936&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/Constants.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/Constants.java Tue Apr 26 22:38:18 2011
@@ -21,6 +21,7 @@
package org.apache.isis.runtimes.dflt.runtime.runner;
import org.apache.isis.core.metamodel.specloader.ObjectReflectorInstaller;
+import org.apache.isis.core.runtime.logging.LoggingConstants;
import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceMechanismInstaller;
import org.apache.isis.runtimes.dflt.runtime.remoting.ClientConnectionInstaller;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
@@ -75,10 +76,11 @@ public final class Constants {
public static final String PASSWORD_LONG_OPT = "password";
public static final String DIAGNOSTICS_OPT = "diagnostics";
- public static final String VERSION_OPT = "version";
- public static final String DEBUG_OPT = "debug";
- public static final String VERBOSE_OPT = "verbose";
- public static final String QUIET_OPT = "quiet";
+ public static final String VERSION_OPT = "version";
+
+ public static final String DEBUG_OPT = LoggingConstants.DEBUG_OPT;
+ public static final String VERBOSE_OPT = LoggingConstants.VERBOSE_OPT;
+ public static final String QUIET_OPT = LoggingConstants.QUIET_OPT;
public static final String ADDITIONAL_PROPERTY = "D";
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisRunner.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisRunner.java?rev=1096936&r1=1096935&r2=1096936&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisRunner.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisRunner.java Tue Apr 26 22:38:18 2011
@@ -34,9 +34,9 @@ import org.apache.isis.applib.maybe.Mayb
import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
import org.apache.isis.core.commons.config.IsisConfigurationBuilderDefault;
import org.apache.isis.core.commons.config.ConfigurationConstants;
+import org.apache.isis.core.runtime.logging.IsisLoggingConfigurer;
import org.apache.isis.runtimes.dflt.runtime.installers.InstallerLookup;
import org.apache.isis.runtimes.dflt.runtime.installers.InstallerLookupDefault;
-import org.apache.isis.runtimes.dflt.runtime.logging.IsisLoggingConfigurer;
import org.apache.isis.runtimes.dflt.runtime.options.standard.OptionHandlerAdditionalProperty;
import org.apache.isis.runtimes.dflt.runtime.options.standard.OptionHandlerConfiguration;
import org.apache.isis.runtimes.dflt.runtime.options.standard.OptionHandlerConnector;
Added: incubator/isis/trunk/runtimes/dflt/runtimes-dflt-JARs.java.hsp
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtimes-dflt-JARs.java.hsp?rev=1096936&view=auto
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtimes-dflt-JARs.java.hsp (added)
+++ incubator/isis/trunk/runtimes/dflt/runtimes-dflt-JARs.java.hsp Tue Apr 26 22:38:18 2011
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<local-project language="java" version="3.4.1223" flavor="j2se">
+ <property name="show-needs-to-compile" value="false" />
+ <property name="hide-externals" value="true" />
+ <property name="detail-mode" value="false" />
+ <classpath>
+ <classpathentry kind="lib" path="D:\SVN\ai\trunk\runtimes\dflt\bytecode\dflt\target\dflt-0.1.2-incubating-SNAPSHOT.jar" />
+ <classpathentry kind="lib" path="D:\SVN\ai\trunk\runtimes\dflt\bytecode\identity\target\identity-0.1.2-incubating-SNAPSHOT.jar" />
+ <classpathentry kind="lib" path="D:\SVN\ai\trunk\runtimes\dflt\bytecode\javassist\target\javassist-0.1.2-incubating-SNAPSHOT.jar" />
+ <classpathentry kind="lib" path="D:\SVN\ai\trunk\runtimes\dflt\objectstores\dflt\target\dflt-0.1.2-incubating-SNAPSHOT.jar" />
+ <classpathentry kind="lib" path="D:\SVN\ai\trunk\runtimes\dflt\objectstores\nosql\target\nosql-0.1.2-incubating-SNAPSHOT.jar" />
+ <classpathentry kind="lib" path="D:\SVN\ai\trunk\runtimes\dflt\objectstores\sql\impl\target\sql-impl-0.1.2-incubating-SNAPSHOT.jar" />
+ <classpathentry kind="lib" path="D:\SVN\ai\trunk\runtimes\dflt\objectstores\sql\target\sql-0.1.2-incubating-SNAPSHOT-tests.jar" />
+ <classpathentry kind="lib" path="D:\SVN\ai\trunk\runtimes\dflt\objectstores\sql\tests-common\target\sql-tests-common-0.1.2-incubating-SNAPSHOT.jar" />
+ <classpathentry kind="lib" path="D:\SVN\ai\trunk\runtimes\dflt\objectstores\xml\target\xml-0.1.2-incubating-SNAPSHOT.jar" />
+ <classpathentry kind="lib" path="D:\SVN\ai\trunk\runtimes\dflt\profilestores\dflt\target\dflt-0.1.2-incubating-SNAPSHOT.jar" />
+ <classpathentry kind="lib" path="D:\SVN\ai\trunk\runtimes\dflt\profilestores\xml\target\xml-0.1.2-incubating-SNAPSHOT.jar" />
+ <classpathentry kind="lib" path="D:\SVN\ai\trunk\runtimes\dflt\remoting\common\target\common-0.1.2-incubating-SNAPSHOT.jar" />
+ <classpathentry kind="lib" path="D:\SVN\ai\trunk\runtimes\dflt\remoting\marshalling-encode\target\marshalling-encode-0.1.2-incubating-SNAPSHOT.jar" />
+ <classpathentry kind="lib" path="D:\SVN\ai\trunk\runtimes\dflt\remoting\marshalling-serialize\target\marshalling-serialize-0.1.2-incubating-SNAPSHOT.jar" />
+ <classpathentry kind="lib" path="D:\SVN\ai\trunk\runtimes\dflt\remoting\marshalling-xstream\target\marshalling-xstream-0.1.2-incubating-SNAPSHOT.jar" />
+ <classpathentry kind="lib" path="D:\SVN\ai\trunk\runtimes\dflt\remoting\target\remoting-0.1.2-incubating-SNAPSHOT-tests.jar" />
+ <classpathentry kind="lib" path="D:\SVN\ai\trunk\runtimes\dflt\remoting\transport-http\client\target\transport-http-client-0.1.2-incubating-SNAPSHOT.jar" />
+ <classpathentry kind="lib" path="D:\SVN\ai\trunk\runtimes\dflt\remoting\transport-http\server\target\transport-http-server-0.1.2-incubating-SNAPSHOT.jar" />
+ <classpathentry kind="lib" path="D:\SVN\ai\trunk\runtimes\dflt\remoting\transport-sockets\target\transport-sockets-0.1.2-incubating-SNAPSHOT.jar" />
+ <classpathentry kind="lib" path="D:\SVN\ai\trunk\runtimes\dflt\runtime\target\runtime-0.1.2-incubating-SNAPSHOT.jar" />
+ <classpathentry kind="lib" path="D:\SVN\ai\trunk\runtimes\dflt\webapp\target\webapp-0.1.2-incubating-SNAPSHOT.jar" />
+ <classpathentry kind="lib" path="D:\SVN\ai\trunk\runtimes\dflt\webserver\target\webserver-0.1.2-incubating-SNAPSHOT.jar" />
+ </classpath>
+ <transformations>
+ <transformation in="*" out="{jar}.*" />
+ </transformations>
+ <restructuring>
+ <set version="1" name="Sandbox 1" hiview="Codemap" active="true" todo="false" />
+ <set version="1" name="Flattened to classes" hiview="Codemap" active="false" todo="false">
+ <action type="flatten" active="true" description="Flatten root">
+ <params flattenLeafFolders="true">
+ <container-fqn fqn="root" type="root" path="" isroot="true" />
+ </params>
+ <composite-set />
+ </action>
+ </set>
+ <set version="1" name="Flattened to leaf packages" hiview="Codemap" active="false" todo="false">
+ <action type="flatten" active="true" description="Flatten root">
+ <params flattenLeafFolders="false">
+ <container-fqn fqn="root" type="root" path="" isroot="true" />
+ </params>
+ <composite-set />
+ </action>
+ </set>
+ </restructuring>
+</local-project>
+