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 2012/02/17 01:33:07 UTC
svn commit: r1245267 - in /incubator/isis/trunk/framework:
src/docbkx/guide/images/jetty-console-banner.png
src/docbkx/guide/isis-contributors-guide.xml
viewer/scimpi/scimpi-servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/ImageLookup.java
Author: danhaywood
Date: Fri Feb 17 00:33:06 2012
New Revision: 1245267
URL: http://svn.apache.org/viewvc?rev=1245267&view=rev
Log:
ISIS-188: minor fix to scimpi so that missing images dir is not treated as fatal; doc fixes
Modified:
incubator/isis/trunk/framework/src/docbkx/guide/images/jetty-console-banner.png
incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml
incubator/isis/trunk/framework/viewer/scimpi/scimpi-servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/ImageLookup.java
Modified: incubator/isis/trunk/framework/src/docbkx/guide/images/jetty-console-banner.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/src/docbkx/guide/images/jetty-console-banner.png?rev=1245267&r1=1245266&r2=1245267&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml?rev=1245267&r1=1245266&r2=1245267&view=diff
==============================================================================
--- incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml (original)
+++ incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml Fri Feb 17 00:33:06 2012
@@ -3592,7 +3592,7 @@ public class FooBar {
url="https://repository.apache.org">https://repository.apache.org</ulink>
and search for "isis".</para>
- <para>Be warned: this is liable will take a long time.</para>
+ <para>Be warned: this is liable take a long time.</para>
</sect2>
</sect1>
</chapter>
@@ -6014,13 +6014,15 @@ gpg --armor --export nnnnnnnn >>KE
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO]
-[INFO] Quickstart App .................................... SUCCESS [0.518s]
-[INFO] Quickstart DOM .................................... SUCCESS [1.873s]
-[INFO] Quickstart Repositories (for ObjectStore Default) . SUCCESS [0.778s]
-[INFO] Quickstart Fixtures ............................... SUCCESS [0.646s]
-[INFO] Quickstart Webapp with HTML+JSON Viewers .......... SUCCESS [8.014s]
-[INFO] Quickstart JUnit Tests ............................ SUCCESS [3.071s]
-[INFO] Quickstart BDD (Concordion) Tests ................. SUCCESS [3.567s]
+[INFO] Quickstart App .................................... SUCCESS [0.583s]
+[INFO] Quickstart DOM .................................... SUCCESS [2.322s]
+[INFO] Quickstart Fixtures ............................... SUCCESS [1.814s]
+[INFO] Quickstart Repositories (for ObjectStore Default) . SUCCESS [2.652s]
+[INFO] Quickstart Repositories (for MongoDB) ............. SUCCESS [2.657s]
+[INFO] Quickstart Repositories (for SQL) ................. SUCCESS [1.811s]
+[INFO] Quickstart Webapp ................................. SUCCESS [9.018s]
+[INFO] Quickstart JUnit Tests ............................ SUCCESS [5.223s]
+[INFO] Quickstart BDD (Concordion) Tests ................. SUCCESS [6.107s]
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
@@ -6038,7 +6040,7 @@ gpg --armor --export nnnnnnnn >>KE
for the surefire plugin).</para>
<para>For example, the
- <filename>tests-bdd/target/concordion/viewer/bdd/stories/todo/ScenarioMarkItemAsComplete.html</filename>
+ <filename>tests-bdd/target/concordion/viewer/bdd/stories/todo/ScenarioMarkItemAsDone.html</filename>
should look something like:</para>
<mediaobject>
@@ -6337,7 +6339,7 @@ $ mvn eclipse:clean clean archetype:crea
just use:</para>
<programlisting>$ cd ..
-$ groovy updateGeneratedArchetypeSource.groovy
+$ groovy updateGeneratedArchetypeSources.groovy
$ cd quickstart</programlisting>
<para>If you want to check this has worked, switch into
Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/ImageLookup.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/ImageLookup.java?rev=1245267&r1=1245266&r2=1245267&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/ImageLookup.java (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/ImageLookup.java Fri Feb 17 00:33:06 2012
@@ -56,7 +56,8 @@ public class ImageLookup {
imageDirectory = (imageDirectory.startsWith("/") ? "" : "/") + imageDirectory + "/";
final Set resourcePaths = context.getResourcePaths(imageDirectory);
if (resourcePaths == null || resourcePaths.size() == 0) {
- throw new IsisException("No image directory found: " + imageDirectory);
+ //throw new IsisException("No image directory found: " + imageDirectory);
+ LOG.warn("No image directory found: " + imageDirectory);
}
LOG.info("image directory set to: " + imageDirectory);
ImageLookup.imageDirectory = imageDirectory;