Return-Path: X-Original-To: apmail-incubator-isis-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-isis-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E57966809 for ; Thu, 30 Jun 2011 09:38:00 +0000 (UTC) Received: (qmail 67573 invoked by uid 500); 30 Jun 2011 09:38:00 -0000 Delivered-To: apmail-incubator-isis-commits-archive@incubator.apache.org Received: (qmail 67548 invoked by uid 500); 30 Jun 2011 09:37:55 -0000 Mailing-List: contact isis-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: isis-dev@incubator.apache.org Delivered-To: mailing list isis-commits@incubator.apache.org Received: (qmail 67523 invoked by uid 99); 30 Jun 2011 09:37:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Jun 2011 09:37:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Jun 2011 09:37:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 65ED123888FD; Thu, 30 Jun 2011 09:37:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1141457 - in /incubator/isis/trunk/framework: quickstart-archetype/ quickstart-archetype/src/main/appended-resources/ src/docbkx/guide/ Date: Thu, 30 Jun 2011 09:37:30 -0000 To: isis-commits@incubator.apache.org From: danhaywood@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110630093730.65ED123888FD@eris.apache.org> Author: danhaywood Date: Thu Jun 30 09:37:29 2011 New Revision: 1141457 URL: http://svn.apache.org/viewvc?rev=1141457&view=rev Log: more updates to archetype and to contributors guide Added: incubator/isis/trunk/framework/quickstart-archetype/src/main/appended-resources/ incubator/isis/trunk/framework/quickstart-archetype/src/main/appended-resources/supplemental-models.xml Modified: incubator/isis/trunk/framework/quickstart-archetype/ (props changed) incubator/isis/trunk/framework/quickstart-archetype/pom.xml incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml Propchange: incubator/isis/trunk/framework/quickstart-archetype/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jun 30 09:37:29 2011 @@ -0,0 +1,2 @@ +.settings +.project Modified: incubator/isis/trunk/framework/quickstart-archetype/pom.xml URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/quickstart-archetype/pom.xml?rev=1141457&r1=1141456&r2=1141457&view=diff ============================================================================== --- incubator/isis/trunk/framework/quickstart-archetype/pom.xml (original) +++ incubator/isis/trunk/framework/quickstart-archetype/pom.xml Thu Jun 30 09:37:29 2011 @@ -1,13 +1,37 @@ + 4.0.0 + + org.apache.isis + isis + 0.1.2-incubating-SNAPSHOT + + org.apache.isis.support quickstart-archetype 0.1.2-incubating-SNAPSHOT maven-archetype - quickstart-archetype + Apache Isis Quickstart Archetype Added: incubator/isis/trunk/framework/quickstart-archetype/src/main/appended-resources/supplemental-models.xml URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/quickstart-archetype/src/main/appended-resources/supplemental-models.xml?rev=1141457&view=auto ============================================================================== --- incubator/isis/trunk/framework/quickstart-archetype/src/main/appended-resources/supplemental-models.xml (added) +++ incubator/isis/trunk/framework/quickstart-archetype/src/main/appended-resources/supplemental-models.xml Thu Jun 30 09:37:29 2011 @@ -0,0 +1,8 @@ + + + + \ No newline at end of file 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=1141457&r1=1141456&r2=1141457&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 Thu Jun 30 09:37:29 2011 @@ -5528,8 +5528,7 @@ gpg --armor --export nnnnnnnn >>KE - from the command line from a shaded - JAR. + from a shaded JAR. For convenience the mvn antrun plugin is used to simplify calling the shaded JAR @@ -5546,27 +5545,36 @@ gpg --armor --export nnnnnnnn >>KE Those viewers which are webapps will have a web.xml specifying the required - servlets/filters/context listeners. For these webapps you can use - one of three approaches, all of which are equivalent, + servlets/filters/context listeners. For these webapps you can either: - using mvn jetty:run + use mvn jetty:run + + In this approach Maven itself starts up a Jetty instance + configured to host the webapp defined by the + web.xml. (if using Eclipse) using the provided Eclipse .launch configuration + In this approach the .launch + configuration runs an Isis-provided class + that in turn starts a Jetty instance configured to host the + webapp defined by the web.xml. + If using Eclipse, then it ought in theory to be possible to use Eclipse WTP (web tooling platform) support, ie "Run as> Run on server". However, at the time of writing there are known issues with the - integration between m2eclipse and WTP: it - does not reliably deploy transitive dependencies. For this - reason we omit testing using WTP. + integration between m2e(clipse) and WTP: + it does not reliably deploy transitive dependencies. For + this reason we omit testing using + WTP. @@ -5860,17 +5868,18 @@ $ mvn jetty:run To fully test with Eclipse, use Eclipse 3.7 with the m2e feature for Maven support. Note that using the m2eclipse with - earlier versions of Eclipse may not suffice, because the .launch - configuration files that are tested have a reference to + earlier versions of Eclipse may not suffice, because the + .launch configuration files that are tested + have a reference to org.eclipse.m2e.launchconfig.classpathProvider (whereas earlier versions the key was under org.maven.ide.eclipse). As noted above, we do not test the webapps using Eclipse's - WTP (web tooling) support, because their are interoperability - problems between WTP and m2e. As and when this improves in the - future, we'll update this guide. + WTP (web tooling) support, because there are interoperability + problems between WTP and m2e. As and when + this improves in the future, we'll update this guide. @@ -5967,7 +5976,7 @@ $ mvn jetty:run quickrun/ide/eclipse/launch/quickstart-quickrun-html.launch http://localhost:8080/logon.app + url="http://localhost:8080/start.app">http://localhost:8080/start.app @@ -6130,9 +6139,10 @@ $ mvn jetty:run - When run from within Eclipse, the BDD tests will generate - their test script in /tmp/concordion (the - default location). + When run from within Eclipse, the BDD + tests will generate their test script in + /tmp/concordion (the default + location). @@ -6221,9 +6231,9 @@ $ mvn eclipse:clean clean archetype:crea linkend="sec.GenerateArchetypeSource" />). So, to make the change, just use: - cd .. -groovy updateGeneratedArchetypeSource.groovy -cd quickstart + $ cd .. +$ groovy updateGeneratedArchetypeSource.groovy +$ cd quickstart If you want to check this has worked, switch into target/generated-sources/archetype/src/main/resources/archetype-resources @@ -6315,7 +6325,7 @@ $ svn commit -m "deleting old archetype Now, copy down to generated archetype - cp -R quickstart/target/generated-sources/archetype quickstart-archetype + $ cp -R /tmp/archetype/quickstart/target/generated-sources/archetype quickstart-archetype @@ -6395,10 +6405,10 @@ $ svn commit -m "deleting old archetype Finally, commit the new archetype: - svn -N add quickstart-archetype -svn add quickstart-archetype/pom.xml -svn add quickstart-archetype/src -svn commit -m "recreated archetype from the 'quickstart' prototype app" quickstart-archetype + $ svn -N add quickstart-archetype +$ svn add quickstart-archetype/pom.xml +$ svn add quickstart-archetype/src +$ svn commit -m "recreated archetype from the 'quickstart' prototype app" quickstart-archetype