|
From: <ian...@us...> - 2007-09-12 17:43:27
|
Revision: 398
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=398&view=rev
Author: iansmith
Date: 2007-09-12 10:43:30 -0700 (Wed, 12 Sep 2007)
Log Message:
-----------
Fixed the build so it should always include the applets.
Integration tests now check that applets are present.
Modified Paths:
--------------
maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java
maven/trunk/ogoglio-server/pom.xml
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/ServiceInitializationPersistTasks.java
Modified: maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java
===================================================================
--- maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java 2007-09-12 13:08:35 UTC (rev 397)
+++ maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java 2007-09-12 17:43:30 UTC (rev 398)
@@ -19,6 +19,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
+import java.net.URISyntaxException;
import java.text.ParseException;
import java.util.Date;
import java.util.Random;
@@ -102,9 +103,27 @@
}
public void tearDown() {
+ }
+ public void testAppletsCanBeDownloaded() throws IOException, URISyntaxException {
+ checkSupportFile("ogoglio-viewer-applet.jar");
+ checkSupportFile("ogoglio-test-applet.jar");
+ checkSupportFile("ogoglio-common.jar");
+ checkSupportFile("ogoglio-body-editor-applet.jar");
}
+ private void checkSupportFile(String name) throws URISyntaxException, IOException {
+ URI supportURI=new URI(serviceURI1.toString()+name);
+ InputStream is=null;
+ try {
+ is=wire1.performGET(supportURI, null);
+ } catch (IOException e) {
+ fail("unable to get the support URI:"+supportURI+" (exception:"+e.getMessage()+")");
+ }
+ assertNotNull(is);
+ is.close();
+ }
+
public void testWebAdmin() throws AuthenticationFailedException, IOException {
PropStorage ps = new PropStorage();
if (ps.loadPropertySet(PropStorage.BOOTSTRAP_PROPS) == false) {
Modified: maven/trunk/ogoglio-server/pom.xml
===================================================================
--- maven/trunk/ogoglio-server/pom.xml 2007-09-12 13:08:35 UTC (rev 397)
+++ maven/trunk/ogoglio-server/pom.xml 2007-09-12 17:43:30 UTC (rev 398)
@@ -132,7 +132,7 @@
<executions>
<execution>
<id>copy-applets</id>
- <phase>package</phase>
+ <phase>test</phase>
<goals>
<goal>copy</goal>
</goals>
@@ -140,7 +140,6 @@
<outputDirectory>
${project.build.directory}/${pom.artifactId}-${version}
</outputDirectory>
- <overwriteIfNewer>true</overwriteIfNewer>
<stripVersion>true</stripVersion>
<artifactItems>
<artifactItem>
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/ServiceInitializationPersistTasks.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/ServiceInitializationPersistTasks.java 2007-09-12 13:08:35 UTC (rev 397)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/ServiceInitializationPersistTasks.java 2007-09-12 17:43:30 UTC (rev 398)
@@ -41,11 +41,11 @@
if (!(ourURI.equals(sim.getSimURI()))) {
//make it point to us
sim.setSimURI(ourURI);
- sim.setActive(true);
+ //sim.setActive(true);
SimPersistTasks.update(sim, sessionFactory);
} else {
if (!sim.isActive()) {
- sim.setActive(true);
+ //sim.setActive(true);
SimPersistTasks.update(sim, sessionFactory);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|