Menu
▾
▴
[Smartfrog-checkins] SF.net SVN: smartfrog: [4879] branches/core-branch-osgi
|
From: <aft...@us...> - 2007-08-02 19:01:48
|
Revision: 4879
http://smartfrog.svn.sourceforge.net/smartfrog/?rev=4879&view=rev
Author: aftereight
Date: 2007-08-02 12:00:40 -0700 (Thu, 02 Aug 2007)
Log Message:
-----------
merge from trunk -r 4870:4878
Modified Paths:
--------------
branches/core-branch-osgi/components/jetty/build.xml
branches/core-branch-osgi/components/tomcat/ivy.xml
branches/core-branch-osgi/components/www/build.xml
branches/core-branch-osgi/components/www/ivy.xml
branches/core-branch-osgi/components/www/src/org/smartfrog/services/www/servers/jboss4.sf
branches/core-branch-osgi/components/www/src/org/smartfrog/services/www/servers/serverbase.sf
branches/core-branch-osgi/components/www/src/org/smartfrog/services/www/servers/tomcat5.sf
branches/core-branch-osgi/components/www/src/org/smartfrog/services/www/testwar-m2.sf
branches/core-branch-osgi/release/build.xml
branches/core-branch-osgi/smartfrog/docs/sfQuickRef.sxw
branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/common/SFMarshalledObject.java
branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/componentdescription/ComponentDescriptionImpl.java
branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/prim/PrimImpl.java
branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/reference/HereReferencePart.java
branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/workflow/conditional/conditions/components.sf
branches/core-branch-osgi/testharness/src/org/smartfrog/test/DeployingTestBase.java
Added Paths:
-----------
branches/core-branch-osgi/components/www/test/
branches/core-branch-osgi/components/www/test/org/
branches/core-branch-osgi/components/www/test/org/smartfrog/
branches/core-branch-osgi/components/www/test/org/smartfrog/services/
branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/
branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/
branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/test/
branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/test/tomcat/
branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/test/tomcat/TomcatTest.java
branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/test/tomcat/components.sf
branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/test/tomcat/testTomcatRuns.sf
Removed Paths:
-------------
branches/core-branch-osgi/components/www/test/org/
branches/core-branch-osgi/components/www/test/org/smartfrog/
branches/core-branch-osgi/components/www/test/org/smartfrog/services/
branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/
branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/
branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/test/
branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/test/tomcat/
branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/test/tomcat/TomcatTest.java
branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/test/tomcat/components.sf
branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/test/tomcat/testTomcatRuns.sf
Modified: branches/core-branch-osgi/components/jetty/build.xml
===================================================================
--- branches/core-branch-osgi/components/jetty/build.xml 2007-08-02 18:42:16 UTC (rev 4878)
+++ branches/core-branch-osgi/components/jetty/build.xml 2007-08-02 19:00:40 UTC (rev 4879)
@@ -40,7 +40,6 @@
<property file="build.properties" />
<property name="root.dir" location="../../" />
<property name="ivy.enabled" value="true"/>
- <!-- System tests turned off to make CC build over them-->
<property name="system.tests" value="true" />
<!-- Import common stuff -->
<!--available file="../../common.xml" property="root.dir" value="../.."/-->
Modified: branches/core-branch-osgi/components/tomcat/ivy.xml
===================================================================
--- branches/core-branch-osgi/components/tomcat/ivy.xml 2007-08-02 18:42:16 UTC (rev 4878)
+++ branches/core-branch-osgi/components/tomcat/ivy.xml 2007-08-02 19:00:40 UTC (rev 4879)
@@ -63,5 +63,6 @@
<exclude org="commons-logging"/>
<exclude org="junit"/>
</dependency>
+
</dependencies>
</ivy-module>
\ No newline at end of file
Modified: branches/core-branch-osgi/components/www/build.xml
===================================================================
--- branches/core-branch-osgi/components/www/build.xml 2007-08-02 18:42:16 UTC (rev 4878)
+++ branches/core-branch-osgi/components/www/build.xml 2007-08-02 19:00:40 UTC (rev 4879)
@@ -34,24 +34,21 @@
<property file="build.properties"/>
<property name="is.component" value="true"/>
<property name="ivy.enabled" value="true"/>
+ <property name="system.tests" value="true" />
<property name="root.dir" location="../.."/>
<!-- Import common stuff -->
<import file="${root.dir}/common.xml"/>
- <!-- ========================================================== -->
- <!-- ========================================================== -->
- <target name="init"
- depends="init-standard-output-dirs,use-smartfrog-tasks,use-smartfrog-testharness">
- </target>
-
<!-- make the WAR file -->
<target name="war.init" depends="init-standard-output-dirs">
<property name="target.war.name"
value="sf-www-testwar-${smartfrog.version}.war"/>
<property name="testwar.war"
location="${dist.dir}/lib/${target.war.name}"/>
+ <property name="test.testwar.war"
+ value="${testwar.war}" />
<property name="testwar.dir"
location="testwar"/>
<property name="testwar.lib.dir"
@@ -92,4 +89,8 @@
<target name="ready-to-publish-all"
depends="common.ready-to-publish-all,war" />
+ <target name="ready-to-test"
+ depends="common.ready-to-test,war" >
+ <property name="test.jdk.home" location="${env.JAVA_HOME}" />
+ </target>
</project>
Modified: branches/core-branch-osgi/components/www/ivy.xml
===================================================================
--- branches/core-branch-osgi/components/www/ivy.xml 2007-08-02 18:42:16 UTC (rev 4878)
+++ branches/core-branch-osgi/components/www/ivy.xml 2007-08-02 19:00:40 UTC (rev 4879)
@@ -55,5 +55,10 @@
name="servlet-api"
rev="${servletapi.version}"
conf="compile,war->master"/>
+ <dependency org="org.smartfrog"
+ name="sf-testharness"
+ changing="true"
+ rev="latest.integration"
+ conf="test->default"/>
</dependencies>
</ivy-module>
\ No newline at end of file
Modified: branches/core-branch-osgi/components/www/src/org/smartfrog/services/www/servers/jboss4.sf
===================================================================
--- branches/core-branch-osgi/components/www/src/org/smartfrog/services/www/servers/jboss4.sf 2007-08-02 18:42:16 UTC (rev 4878)
+++ branches/core-branch-osgi/components/www/src/org/smartfrog/services/www/servers/jboss4.sf 2007-08-02 19:00:40 UTC (rev 4879)
@@ -97,7 +97,7 @@
sysProperties [
["sun.rmi.dgc.client.gcInterval",gcInterval ],
["sun.rmi.dgc.server.gcInterval",gcInterval ],
- PARENT:PARENT:sysProperties
+ PARENT:sysProperties
];
maxMemory 512;
Modified: branches/core-branch-osgi/components/www/src/org/smartfrog/services/www/servers/serverbase.sf
===================================================================
--- branches/core-branch-osgi/components/www/src/org/smartfrog/services/www/servers/serverbase.sf 2007-08-02 18:42:16 UTC (rev 4878)
+++ branches/core-branch-osgi/components/www/src/org/smartfrog/services/www/servers/serverbase.sf 2007-08-02 19:00:40 UTC (rev 4879)
@@ -116,9 +116,7 @@
LAZY endorsed
];
- sysProperties [
- PARENT:PARENT:sysProperties
- ];
+ sysProperties PARENT:ATTRIB sysProperties;
jvmArgs [
"-server"
Modified: branches/core-branch-osgi/components/www/src/org/smartfrog/services/www/servers/tomcat5.sf
===================================================================
--- branches/core-branch-osgi/components/www/src/org/smartfrog/services/www/servers/tomcat5.sf 2007-08-02 18:42:16 UTC (rev 4878)
+++ branches/core-branch-osgi/components/www/src/org/smartfrog/services/www/servers/tomcat5.sf 2007-08-02 19:00:40 UTC (rev 4879)
@@ -98,7 +98,7 @@
server extends ServerBase:server {
arguments [
- "run",
+ "run"
];
processName "catalina";
@@ -112,9 +112,10 @@
sysProperties [
- ["catalina.home",PARENT:server.home.dir:absolutePath],
- ["catalina.base",PARENT:catalina.base.dir:absolutePath],
- PARENT:PARENT:sysProperties
+ ["catalina.home",LAZY PARENT:server.home.dir:absolutePath],
+ ["catalina.base",LAZY PARENT:catalina.base.dir:absolutePath]
+ //,
+ //PARENT:ATTRIB sysProperties
];
maxMemory 64;
@@ -129,7 +130,7 @@
* simply by removing the server entry.
* For deployments where the server is started already, somehow.
*/
-Tomcat5Server extends Tomcat5Server {
+RunningTomcat5Server extends Tomcat5Server {
server extends Compound {
}
Modified: branches/core-branch-osgi/components/www/src/org/smartfrog/services/www/testwar-m2.sf
===================================================================
--- branches/core-branch-osgi/components/www/src/org/smartfrog/services/www/testwar-m2.sf 2007-08-02 18:42:16 UTC (rev 4878)
+++ branches/core-branch-osgi/components/www/src/org/smartfrog/services/www/testwar-m2.sf 2007-08-02 19:00:40 UTC (rev 4879)
@@ -39,6 +39,9 @@
* It is file to pull in the testwar from a local m2 repository. It allows
* test deployments to be written which do not contain any hard-coded path dependencies with
* the www application.
+ *
+ * with the move to an Ivy based build, this component is of limited use, but we cannot switch to an Ivy
+ * policy as we are currently building with both Ivy1 and Ivy2, each of which caches files to a different directrion
*/
testwarLoader extends Compound {
@@ -56,7 +59,7 @@
testwar extends JarArtifact {
library LAZY PARENT:library;
project "org.smartfrog";
- artifact "testwar";
+ artifact "sf-www-testwar";
extension "war";
version "0.1-SNAPSHOT";
//expected to be installed locally; no retrieval
Copied: branches/core-branch-osgi/components/www/test (from rev 4878, trunk/core/components/www/test)
Copied: branches/core-branch-osgi/components/www/test/org (from rev 4878, trunk/core/components/www/test/org)
Copied: branches/core-branch-osgi/components/www/test/org/smartfrog (from rev 4878, trunk/core/components/www/test/org/smartfrog)
Copied: branches/core-branch-osgi/components/www/test/org/smartfrog/services (from rev 4878, trunk/core/components/www/test/org/smartfrog/services)
Copied: branches/core-branch-osgi/components/www/test/org/smartfrog/services/www (from rev 4878, trunk/core/components/www/test/org/smartfrog/services/www)
Copied: branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers (from rev 4878, trunk/core/components/www/test/org/smartfrog/services/www/servers)
Copied: branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/test (from rev 4878, trunk/core/components/www/test/org/smartfrog/services/www/servers/test)
Copied: branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/test/tomcat (from rev 4878, trunk/core/components/www/test/org/smartfrog/services/www/servers/test/tomcat)
Deleted: branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/test/tomcat/TomcatTest.java
===================================================================
--- trunk/core/components/www/test/org/smartfrog/services/www/servers/test/tomcat/TomcatTest.java 2007-08-02 18:42:16 UTC (rev 4878)
+++ branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/test/tomcat/TomcatTest.java 2007-08-02 19:00:40 UTC (rev 4879)
@@ -1,41 +0,0 @@
-/** (C) Copyright 2007 Hewlett-Packard Development Company, LP
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-For more information: www.smartfrog.org
-
-*/
-package org.smartfrog.services.www.servers.test.tomcat;
-
-import org.smartfrog.test.DeployingTestBase;
-
-/**
- *
- * Created 01-Aug-2007 17:25:18
- *
- */
-
-public class TomcatTest extends DeployingTestBase {
- private static final String FILES = "/org/smartfrog/services/www/servers/test/tomcat/";
-
-
- public TomcatTest(String name) {
- super(name);
- }
-
- public void testTomcatRuns() throws Throwable {
- expectSuccessfulTestRun(FILES,"testTomcatRuns.sf");
- }
-}
Copied: branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/test/tomcat/TomcatTest.java (from rev 4878, trunk/core/components/www/test/org/smartfrog/services/www/servers/test/tomcat/TomcatTest.java)
===================================================================
--- branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/test/tomcat/TomcatTest.java (rev 0)
+++ branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/test/tomcat/TomcatTest.java 2007-08-02 19:00:40 UTC (rev 4879)
@@ -0,0 +1,41 @@
+/** (C) Copyright 2007 Hewlett-Packard Development Company, LP
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+For more information: www.smartfrog.org
+
+*/
+package org.smartfrog.services.www.servers.test.tomcat;
+
+import org.smartfrog.test.DeployingTestBase;
+
+/**
+ *
+ * Created 01-Aug-2007 17:25:18
+ *
+ */
+
+public class TomcatTest extends DeployingTestBase {
+ private static final String FILES = "/org/smartfrog/services/www/servers/test/tomcat/";
+
+
+ public TomcatTest(String name) {
+ super(name);
+ }
+
+ public void testTomcatRuns() throws Throwable {
+ expectSuccessfulTestRun(FILES,"testTomcatRuns.sf");
+ }
+}
Deleted: branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/test/tomcat/components.sf
===================================================================
--- trunk/core/components/www/test/org/smartfrog/services/www/servers/test/tomcat/components.sf 2007-08-02 18:42:16 UTC (rev 4878)
+++ branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/test/tomcat/components.sf 2007-08-02 19:00:40 UTC (rev 4879)
@@ -1,68 +0,0 @@
-/** (C) Copyright 2007 Hewlett-Packard Development Company, LP
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-For more information: www.smartfrog.org
-
-*/
-#include "/org/smartfrog/services/filesystem/components.sf"
-#include "/org/smartfrog/services/assertions/components.sf"
-#include "/org/smartfrog/services/www/servers/tomcat5.sf"
-//#include "/org/smartfrog/sfcore/workflow/conditional/conditions/components.sf"
-
-
-// this is a non-lazy binding to whatever is passed in to the deployment process; it sets
-// tomcat.home to the property or to ""
-tomcat.home OPTIONAL("") PROPERTY test.tomcat.home;
-
-// a boolean property that is true if tomcat.home is non-empty
-tomcat.present IF (tomcat.home != "") THEN true ELSE false FI;
-
-
-jdk.home PROPERTY test.jdk.home ;
-
-// now switch this to a condition
-IsTomcatPresent extends BooleanValue {
- value tomcat.present;
-}
-
-/**
- * Tomcat bound to the local properties
- */
-BoundTomcatServer extends Tomcat5Server {
- server.home tomcat.home;
- jdk.home PARENT:ATTRIB jdk.home;
-}
-
-/**
- * a template that only deploys if test.tomcat.home is set
- * we use this to make things conditional
- */
-DeployTomcat extends ExpectDeploy {
- condition extends IsTomcatPresent;
-
- action extends Compound {
- tomcat extends BoundTomcatServer;
- }
-
- undeployAfter 15000;
-
-}
-
-/*
- * one test with a 10s shutdown
- */
-testTomcatRuns extends DeployTomcat {
-}
Copied: branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/test/tomcat/components.sf (from rev 4878, trunk/core/components/www/test/org/smartfrog/services/www/servers/test/tomcat/components.sf)
===================================================================
--- branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/test/tomcat/components.sf (rev 0)
+++ branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/test/tomcat/components.sf 2007-08-02 19:00:40 UTC (rev 4879)
@@ -0,0 +1,68 @@
+/** (C) Copyright 2007 Hewlett-Packard Development Company, LP
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+For more information: www.smartfrog.org
+
+*/
+#include "/org/smartfrog/services/filesystem/components.sf"
+#include "/org/smartfrog/services/assertions/components.sf"
+#include "/org/smartfrog/services/www/servers/tomcat5.sf"
+//#include "/org/smartfrog/sfcore/workflow/conditional/conditions/components.sf"
+
+
+// this is a non-lazy binding to whatever is passed in to the deployment process; it sets
+// tomcat.home to the property or to ""
+tomcat.home OPTIONAL("") PROPERTY test.tomcat.home;
+
+// a boolean property that is true if tomcat.home is non-empty
+tomcat.present IF (tomcat.home != "") THEN true ELSE false FI;
+
+
+jdk.home PROPERTY test.jdk.home ;
+
+// now switch this to a condition
+IsTomcatPresent extends BooleanValue {
+ value tomcat.present;
+}
+
+/**
+ * Tomcat bound to the local properties
+ */
+BoundTomcatServer extends Tomcat5Server {
+ server.home tomcat.home;
+ jdk.home PARENT:ATTRIB jdk.home;
+}
+
+/**
+ * a template that only deploys if test.tomcat.home is set
+ * we use this to make things conditional
+ */
+DeployTomcat extends ExpectDeploy {
+ condition extends IsTomcatPresent;
+
+ action extends Compound {
+ tomcat extends BoundTomcatServer;
+ }
+
+ undeployAfter 15000;
+
+}
+
+/*
+ * one test with a 10s shutdown
+ */
+testTomcatRuns extends DeployTomcat {
+}
Deleted: branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/test/tomcat/testTomcatRuns.sf
===================================================================
--- trunk/core/components/www/test/org/smartfrog/services/www/servers/test/tomcat/testTomcatRuns.sf 2007-08-02 18:42:16 UTC (rev 4878)
+++ branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/test/tomcat/testTomcatRuns.sf 2007-08-02 19:00:40 UTC (rev 4879)
@@ -1,26 +0,0 @@
-/** (C) Copyright 2007 Hewlett-Packard Development Company, LP
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-For more information: www.smartfrog.org
-
-*/
-#include "/org/smartfrog/services/www/servers/test/tomcat/components.sf"
-
-
-
-sfConfig extends testTomcatRuns {
-
-}
Copied: branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/test/tomcat/testTomcatRuns.sf (from rev 4878, trunk/core/components/www/test/org/smartfrog/services/www/servers/test/tomcat/testTomcatRuns.sf)
===================================================================
--- branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/test/tomcat/testTomcatRuns.sf (rev 0)
+++ branches/core-branch-osgi/components/www/test/org/smartfrog/services/www/servers/test/tomcat/testTomcatRuns.sf 2007-08-02 19:00:40 UTC (rev 4879)
@@ -0,0 +1,26 @@
+/** (C) Copyright 2007 Hewlett-Packard Development Company, LP
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+For more information: www.smartfrog.org
+
+*/
+#include "/org/smartfrog/services/www/servers/test/tomcat/components.sf"
+
+
+
+sfConfig extends testTomcatRuns {
+
+}
Modified: branches/core-branch-osgi/release/build.xml
===================================================================
--- branches/core-branch-osgi/release/build.xml 2007-08-02 18:42:16 UTC (rev 4878)
+++ branches/core-branch-osgi/release/build.xml 2007-08-02 19:00:40 UTC (rev 4879)
@@ -374,9 +374,7 @@
<tar destfile="${rpms.tar}">
<fileset dir="${dist.rpm.dir}" includes="*.rpm" />
</tar>
- <gzip destfile="${rpms.tar.gz}" >
- <fileset file="${rpms.tar}" />
- </gzip>
+ <gzip destfile="${rpms.tar.gz}" src="${rpms.tar}" />
</target>
Modified: branches/core-branch-osgi/smartfrog/docs/sfQuickRef.sxw
===================================================================
(Binary files differ)
Modified: branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/common/SFMarshalledObject.java
===================================================================
--- branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/common/SFMarshalledObject.java 2007-08-02 18:42:16 UTC (rev 4878)
+++ branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/common/SFMarshalledObject.java 2007-08-02 19:00:40 UTC (rev 4879)
@@ -58,18 +58,12 @@
* @return An unwrapped version of the original object, or exactly
* the original object if we have not been serialized.
*/
- public synchronized Object get() {
+ public synchronized Object get() throws IOException, ClassNotFoundException {
if ((!alreadySet) || (value == null)) {
return value;
}
if (value instanceof MarshalledObject && !wasMarshalled) {
- try {
- return ((MarshalledObject)value).get();
- } catch (ClassNotFoundException ex) {
- return null;
- } catch (IOException ex) {
- return null;
- }
+ return ((MarshalledObject)value).get();
} else {
return value;
}
@@ -94,7 +88,7 @@
* "packing" multiple times in case we serialize multiple times.
*
*/
- private synchronized void pack(){
+ private synchronized void pack() throws IOException {
if (alreadySet) {
return;
}
@@ -102,11 +96,7 @@
if (value instanceof MarshalledObject) {
wasMarshalled = true;
} else {
- try {
- value = new MarshalledObject(value);
- } catch (IOException ex) {
- // need to log this...
- }
+ value = new MarshalledObject(value);
}
} finally {
alreadySet = true;
Modified: branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/componentdescription/ComponentDescriptionImpl.java
===================================================================
--- branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/componentdescription/ComponentDescriptionImpl.java 2007-08-02 18:42:16 UTC (rev 4878)
+++ branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/componentdescription/ComponentDescriptionImpl.java 2007-08-02 19:00:40 UTC (rev 4879)
@@ -582,13 +582,20 @@
Object obj = sfResolve(r, 0);
if (obj instanceof SFMarshalledObject){
// Unmarshall!Obj.
- obj = ((SFMarshalledObject)obj).get();
+ try {
+ obj = ((SFMarshalledObject)obj).get();
+ } catch (IOException e) {
+ throw (SmartFrogResolutionException)SmartFrogResolutionException.forward(e.getMessage(),e);
+ } catch (ClassNotFoundException e) {
+ throw (SmartFrogResolutionException)SmartFrogResolutionException.forward(e.getMessage(),e);
+ }
}
try {
if ((sfLog()!= null) && sfLog().isTraceEnabled()) {
sfLog().trace("sfResolved: "+r.toString()+" to "+obj.toString());
}
} catch (Exception ex) {ex.printStackTrace();}//ignore}
+
return obj;
}
Modified: branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/prim/PrimImpl.java
===================================================================
--- branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/prim/PrimImpl.java 2007-08-02 18:42:16 UTC (rev 4878)
+++ branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/prim/PrimImpl.java 2007-08-02 19:00:40 UTC (rev 4879)
@@ -31,6 +31,7 @@
import java.util.Set;
import java.lang.reflect.Method;
import java.lang.reflect.Field;
+import java.io.IOException;
import org.smartfrog.sfcore.common.*;
import org.smartfrog.sfcore.common.Diagnostics;
@@ -275,7 +276,13 @@
Object obj = sfResolve(rn, 0);
if (obj instanceof SFMarshalledObject){
// Unmarshall!Obj.
- obj = ((SFMarshalledObject)obj).get();
+ try {
+ obj = ((SFMarshalledObject)obj).get();
+ } catch (IOException e) {
+ throw (SmartFrogResolutionException)SmartFrogResolutionException.forward(e.getMessage(),e);
+ } catch (ClassNotFoundException e) {
+ throw (SmartFrogResolutionException)SmartFrogResolutionException.forward(e.getMessage(),e);
+ }
}
try {
if (sfLog().isTraceEnabled()) {
Modified: branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/reference/HereReferencePart.java
===================================================================
--- branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/reference/HereReferencePart.java 2007-08-02 18:42:16 UTC (rev 4878)
+++ branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/reference/HereReferencePart.java 2007-08-02 19:00:40 UTC (rev 4879)
@@ -28,6 +28,7 @@
import java.rmi.RemoteException;
import java.util.Enumeration;
import java.util.Vector;
+import java.io.IOException;
/**
* Implements the most basic of reference parts. This reference part knows how
@@ -280,7 +281,14 @@
if (value instanceof Reference) {
value = rr.sfResolve((Reference)value, 0);
if (value instanceof SFMarshalledObject) {
- value = ((SFMarshalledObject)value).get();
+ try {
+ value = ((SFMarshalledObject)value).get();
+ } catch (IOException ex) {
+ throw (SmartFrogResolutionException)SmartFrogResolutionException.forward(ex.getMessage(),ex);
+ } catch (ClassNotFoundException ex) {
+ throw (SmartFrogResolutionException)SmartFrogResolutionException.forward(ex.getMessage(),ex);
+ }
+
}
}
if (value instanceof Vector) {
Modified: branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/workflow/conditional/conditions/components.sf
===================================================================
--- branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/workflow/conditional/conditions/components.sf 2007-08-02 18:42:16 UTC (rev 4878)
+++ branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/workflow/conditional/conditions/components.sf 2007-08-02 19:00:40 UTC (rev 4879)
@@ -50,17 +50,17 @@
* it can be linked to something else that is changing
*/
-Value extends ConditionPrim {
+BooleanValue extends ConditionPrim {
sfClass "org.smartfrog.sfcore.workflow.conditional.conditions.BooleanValue";
value TBD;
}
-True extends Value {
+True extends BooleanValue {
value true;
}
-False extends Value {
+False extends BooleanValue {
value false;
}
Modified: branches/core-branch-osgi/testharness/src/org/smartfrog/test/DeployingTestBase.java
===================================================================
--- branches/core-branch-osgi/testharness/src/org/smartfrog/test/DeployingTestBase.java 2007-08-02 18:42:16 UTC (rev 4878)
+++ branches/core-branch-osgi/testharness/src/org/smartfrog/test/DeployingTestBase.java 2007-08-02 19:00:40 UTC (rev 4879)
@@ -244,7 +244,7 @@
TestCompletedEvent results = (TestCompletedEvent) event;
conditionalFail(results.isForcedTimeout(),
"Forced timeout", event);
- conditionalFail(results.isFailed(),
+ conditionalFail(results.isFailed() && !results.isSkipped(),
"Test failed", event);
return results;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|