You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/06/14 23:14:49 UTC

svn commit: r190657 [2/23] - in /incubator/beehive/trunk/system-controls: ./ ant/ samples/ejb/ samples/ejb/client/org/apache/beehive/controls/system/ejb/sample/client/ samples/ejb/control/org/apache/beehive/controls/system/ejb/sample/control/ samples/ejb/ejb/META-INF/ samples/ejb/ejb/org/apache/beehive/controls/system/ejb/sample/bean/ samples/jdbc/jdbcControlSample/ samples/jdbc/jdbcControlSample/META-INF/ samples/jdbc/jdbcControlSample/WEB-INF/ samples/jdbc/jdbcControlSample/WEB-INF/src/ samples/jdbc/jdbcControlSample/WEB-INF/src/controls/ samples/jdbc/jdbcControlSample/WEB-INF/src/servlet/ samples/jdbc/jdbcControlSample/WEB-INF/src/shared/ samples/jms/ samples/jms/src/org/apache/beehive/controls/system/jms/samples/ samples/webservice/amazon/ samples/webservice/amazon/junit/ samples/webservice/amazon/schemas/ samples/webservice/common/src/test/ samples/webservice/google/ samples/webservice/google/junit/model/ samples/webservice/google/rpc_schemas/ samples/webservice/google/servlet/ samples/webservice/wsm_samples_client/ samples/webservice/wsm_samples_client/junit/ samples/webservice/wsm_samples_client/junit/org/wsm/samples/client/header/ samples/webservice/wsm_samples_client/junit/org/wsm/samples/client/webparam/ samples/webservice/xmlbeans/ samples/webservice/xmlbeans/junit/ src/ejb/ src/ejb/org/apache/beehive/controls/system/ejb/ src/ejb/schema/ src/jdbc/ src/jdbc/org/apache/beehive/controls/system/jdbc/ src/jdbc/org/apache/beehive/controls/system/jdbc/parser/ src/jms/ src/jms/org/apache/beehive/controls/system/jms/ src/jms/org/apache/beehive/controls/system/jms/impl/ src/jms/org/apache/beehive/controls/system/jndi/ src/jms/org/apache/beehive/controls/system/jndi/impl/ src/webservice/ src/webservice/org/apache/beehive/controls/system/webservice/ src/webservice/org/apache/beehive/controls/system/webservice/generator/ src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ src/webservice/org/apache/beehive/controls/system/webservice/utils/ test/ant/ test/conf/ test/src/jdbc/controls/ test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/dbconnection/ test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/errors/ test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/results/ test/src/jdbc/controls/schemas/badusers/ test/src/jdbc/controls/schemas/users/ test/src/jdbc/jdbc-container/ test/src/jdbc/jdbc-container/application/ test/src/jdbc/jdbc-container/src/org/apache/beehive/controls/system/jdbc/containertest/ test/src/jdbc/jdbc-container/webapp/WEB-INF/ test/src/jdbc/jdbc-container/webapp/conf/Catalina/localhost/ test/src/jdbc/junitTests/ test/src/jdbc/junitTests/org/apache/beehive/controls/system/jdbc/units/dbconnection/ test/src/jdbc/junitTests/org/apache/beehive/controls/system/jdbc/units/errors/ test/src/jdbc/junitTests/org/apache/beehive/controls/system/jdbc/units/results/ test/src/jdbc/junitTests/org/apache/beehive/controls/system/jdbc/units/sqlparser/ test/src/jdbc/junitTests/org/apache/beehive/controls/system/jdbc/units/utils/ test/src/webservice/ test/src/webservice/jcxgen-tests/ test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/jcxgen/ test/src/webservice/schemas/ test/src/webservice/servers/webapp/WEB-INF/ test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/doclitwrap/ test/src/webservice/servers/webapp/WEB-INF/src/web/ test/src/webservice/servers/webapp/WEB-INF/webservices/web/complex/ test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/dlwservice/

Modified: incubator/beehive/trunk/system-controls/samples/ejb/control/org/apache/beehive/controls/system/ejb/sample/control/HelloEJBControl.jcx
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/samples/ejb/control/org/apache/beehive/controls/system/ejb/sample/control/HelloEJBControl.jcx?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/samples/ejb/control/org/apache/beehive/controls/system/ejb/sample/control/HelloEJBControl.jcx (original)
+++ incubator/beehive/trunk/system-controls/samples/ejb/control/org/apache/beehive/controls/system/ejb/sample/control/HelloEJBControl.jcx Tue Jun 14 14:14:42 2005
@@ -1,32 +1,32 @@
-/*
- * Copyright 2004 BEA Systems, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.beehive.controls.system.ejb.sample.control;
-
-import org.apache.beehive.controls.api.bean.ControlExtension;
-import org.apache.beehive.controls.system.ejb.EJBControl;
-import org.apache.beehive.controls.system.ejb.SessionEJBControl;
-import org.apache.beehive.controls.system.ejb.sample.bean.HelloHome;
-import org.apache.beehive.controls.system.ejb.sample.bean.HelloRemote;
-
-@ControlExtension
-@EJBControl.EJBHome(jndiName="org.apache.beehive.controls.system.ejb.sample.HelloHome")
-@EJBControl.JNDIContextEnv(contextFactory="weblogic.jndi.WLInitialContextFactory",
-        providerURL="t3://localhost:7001", principal="weblogic", credentials="weblogic")
-public interface HelloEJBControl
-	extends SessionEJBControl, HelloHome, HelloRemote
-{
-}
+/*
+ * Copyright 2004 BEA Systems, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.beehive.controls.system.ejb.sample.control;
+
+import org.apache.beehive.controls.api.bean.ControlExtension;
+import org.apache.beehive.controls.system.ejb.EJBControl;
+import org.apache.beehive.controls.system.ejb.SessionEJBControl;
+import org.apache.beehive.controls.system.ejb.sample.bean.HelloHome;
+import org.apache.beehive.controls.system.ejb.sample.bean.HelloRemote;
+
+@ControlExtension
+@EJBControl.EJBHome(jndiName="org.apache.beehive.controls.system.ejb.sample.HelloHome")
+@EJBControl.JNDIContextEnv(contextFactory="weblogic.jndi.WLInitialContextFactory",
+        providerURL="t3://localhost:7001", principal="weblogic", credentials="weblogic")
+public interface HelloEJBControl
+	extends SessionEJBControl, HelloHome, HelloRemote
+{
+}

Propchange: incubator/beehive/trunk/system-controls/samples/ejb/control/org/apache/beehive/controls/system/ejb/sample/control/HelloEJBControl.jcx
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/beehive/trunk/system-controls/samples/ejb/ejb/META-INF/ejb-jar.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/system-controls/samples/ejb/ejb/org/apache/beehive/controls/system/ejb/sample/bean/HelloBean.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/samples/ejb/ejb/org/apache/beehive/controls/system/ejb/sample/bean/HelloBean.java?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/samples/ejb/ejb/org/apache/beehive/controls/system/ejb/sample/bean/HelloBean.java (original)
+++ incubator/beehive/trunk/system-controls/samples/ejb/ejb/org/apache/beehive/controls/system/ejb/sample/bean/HelloBean.java Tue Jun 14 14:14:42 2005
@@ -1,60 +1,60 @@
-/*
- * Copyright 2004 BEA Systems, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.beehive.controls.system.ejb.sample.bean;
-
-import java.rmi.RemoteException;
-import javax.ejb.*;
-
-public class HelloBean implements SessionBean
-{
-    public HelloBean()
-    {
-    }
-
-    public void ejbCreate()
-    {
-    }
-
-    public void ejbRemove()
-        throws EJBException, RemoteException
-    {
-    }
-
-    public void ejbActivate()
-        throws EJBException, RemoteException
-    {
-
-    }
-
-    public void ejbPassivate()
-        throws EJBException, RemoteException
-    {
-    }
-
-    public void setSessionContext(SessionContext ctx)
-    {
-        this.ctx = ctx;
-    }
-
-    public String hello()
-    {
-        return "Hello";
-    }
-
-   private static final long serialVersionUID = 0xa0aa87e44ca8f7c2L;
-    private SessionContext ctx;
-}
+/*
+ * Copyright 2004 BEA Systems, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.beehive.controls.system.ejb.sample.bean;
+
+import java.rmi.RemoteException;
+import javax.ejb.*;
+
+public class HelloBean implements SessionBean
+{
+    public HelloBean()
+    {
+    }
+
+    public void ejbCreate()
+    {
+    }
+
+    public void ejbRemove()
+        throws EJBException, RemoteException
+    {
+    }
+
+    public void ejbActivate()
+        throws EJBException, RemoteException
+    {
+
+    }
+
+    public void ejbPassivate()
+        throws EJBException, RemoteException
+    {
+    }
+
+    public void setSessionContext(SessionContext ctx)
+    {
+        this.ctx = ctx;
+    }
+
+    public String hello()
+    {
+        return "Hello";
+    }
+
+   private static final long serialVersionUID = 0xa0aa87e44ca8f7c2L;
+    private SessionContext ctx;
+}

Propchange: incubator/beehive/trunk/system-controls/samples/ejb/ejb/org/apache/beehive/controls/system/ejb/sample/bean/HelloBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/system-controls/samples/ejb/ejb/org/apache/beehive/controls/system/ejb/sample/bean/HelloHome.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/samples/ejb/ejb/org/apache/beehive/controls/system/ejb/sample/bean/HelloHome.java?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/samples/ejb/ejb/org/apache/beehive/controls/system/ejb/sample/bean/HelloHome.java (original)
+++ incubator/beehive/trunk/system-controls/samples/ejb/ejb/org/apache/beehive/controls/system/ejb/sample/bean/HelloHome.java Tue Jun 14 14:14:42 2005
@@ -1,32 +1,32 @@
-/*
- * Copyright 2004 BEA Systems, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.beehive.controls.system.ejb.sample.bean;
-
-import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
-
-// Referenced classes of package org.apache.beehive.controls.junit.ejb.impl:
-//            JUnitRunnerRemote
-
-public interface HelloHome
-    extends EJBHome
-{
-
-    public abstract HelloRemote create()
-        throws CreateException, RemoteException;
-}
+/*
+ * Copyright 2004 BEA Systems, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.beehive.controls.system.ejb.sample.bean;
+
+import java.rmi.RemoteException;
+import javax.ejb.CreateException;
+import javax.ejb.EJBHome;
+
+// Referenced classes of package org.apache.beehive.controls.junit.ejb.impl:
+//            JUnitRunnerRemote
+
+public interface HelloHome
+    extends EJBHome
+{
+
+    public abstract HelloRemote create()
+        throws CreateException, RemoteException;
+}

Propchange: incubator/beehive/trunk/system-controls/samples/ejb/ejb/org/apache/beehive/controls/system/ejb/sample/bean/HelloHome.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/system-controls/samples/ejb/ejb/org/apache/beehive/controls/system/ejb/sample/bean/HelloLocal.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/samples/ejb/ejb/org/apache/beehive/controls/system/ejb/sample/bean/HelloLocal.java?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/samples/ejb/ejb/org/apache/beehive/controls/system/ejb/sample/bean/HelloLocal.java (original)
+++ incubator/beehive/trunk/system-controls/samples/ejb/ejb/org/apache/beehive/controls/system/ejb/sample/bean/HelloLocal.java Tue Jun 14 14:14:42 2005
@@ -1,25 +1,25 @@
-/*
- * Copyright 2004 BEA Systems, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.beehive.controls.system.ejb.sample.bean;
-
-import javax.ejb.EJBLocalObject;
-
-public interface HelloLocal
-    extends EJBLocalObject
-{
-    public abstract String hello();
-}
+/*
+ * Copyright 2004 BEA Systems, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.beehive.controls.system.ejb.sample.bean;
+
+import javax.ejb.EJBLocalObject;
+
+public interface HelloLocal
+    extends EJBLocalObject
+{
+    public abstract String hello();
+}

Propchange: incubator/beehive/trunk/system-controls/samples/ejb/ejb/org/apache/beehive/controls/system/ejb/sample/bean/HelloLocal.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/system-controls/samples/ejb/ejb/org/apache/beehive/controls/system/ejb/sample/bean/HelloLocalHome.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/samples/ejb/ejb/org/apache/beehive/controls/system/ejb/sample/bean/HelloLocalHome.java?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/samples/ejb/ejb/org/apache/beehive/controls/system/ejb/sample/bean/HelloLocalHome.java (original)
+++ incubator/beehive/trunk/system-controls/samples/ejb/ejb/org/apache/beehive/controls/system/ejb/sample/bean/HelloLocalHome.java Tue Jun 14 14:14:42 2005
@@ -1,31 +1,31 @@
-/*
- * Copyright 2004 BEA Systems, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.beehive.controls.system.ejb.sample.bean;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
-
-// Referenced classes of package org.apache.beehive.controls.junit.ejb.impl:
-//            JUnitRunnerRemote
-
-public interface HelloLocalHome
-    extends EJBLocalHome
-{
-
-    public abstract HelloLocal create()
-        throws CreateException;
-}
+/*
+ * Copyright 2004 BEA Systems, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.beehive.controls.system.ejb.sample.bean;
+
+import javax.ejb.CreateException;
+import javax.ejb.EJBLocalHome;
+
+// Referenced classes of package org.apache.beehive.controls.junit.ejb.impl:
+//            JUnitRunnerRemote
+
+public interface HelloLocalHome
+    extends EJBLocalHome
+{
+
+    public abstract HelloLocal create()
+        throws CreateException;
+}

Propchange: incubator/beehive/trunk/system-controls/samples/ejb/ejb/org/apache/beehive/controls/system/ejb/sample/bean/HelloLocalHome.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/system-controls/samples/ejb/ejb/org/apache/beehive/controls/system/ejb/sample/bean/HelloRemote.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/samples/ejb/ejb/org/apache/beehive/controls/system/ejb/sample/bean/HelloRemote.java?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/samples/ejb/ejb/org/apache/beehive/controls/system/ejb/sample/bean/HelloRemote.java (original)
+++ incubator/beehive/trunk/system-controls/samples/ejb/ejb/org/apache/beehive/controls/system/ejb/sample/bean/HelloRemote.java Tue Jun 14 14:14:42 2005
@@ -1,27 +1,27 @@
-/*
- * Copyright 2004 BEA Systems, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.beehive.controls.system.ejb.sample.bean;
-
-import java.rmi.RemoteException;
-import javax.ejb.EJBObject;
-
-public interface HelloRemote
-    extends EJBObject
-{
-    public abstract String hello()
-		throws RemoteException;
-}
+/*
+ * Copyright 2004 BEA Systems, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.beehive.controls.system.ejb.sample.bean;
+
+import java.rmi.RemoteException;
+import javax.ejb.EJBObject;
+
+public interface HelloRemote
+    extends EJBObject
+{
+    public abstract String hello()
+		throws RemoteException;
+}

Propchange: incubator/beehive/trunk/system-controls/samples/ejb/ejb/org/apache/beehive/controls/system/ejb/sample/bean/HelloRemote.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/Controller.jpf
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/Controller.jpf?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/Controller.jpf (original)
+++ incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/Controller.jpf Tue Jun 14 14:14:42 2005
@@ -1,126 +1,126 @@
-import javax.servlet.http.HttpSession;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import javax.servlet.http.HttpServletRequest;
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-import org.apache.beehive.controls.api.bean.Control;
-import controls.SimpleDBControl;
-import controls.PopulateDBCtrl;
-import shared.SharedFlow;
-
-@Jpf.Controller(
-    simpleActions={},
-    sharedFlowRefs={
-        @Jpf.SharedFlowRef(name="shared", type=shared.SharedFlow.class)
-    }
-)
-public class Controller 
-    extends PageFlowController
-{
-    @Jpf.SharedFlowField(name="shared")
-    private shared.SharedFlow sharedFlow;
-
-    // initialize the SimpleDBCtrl
-    @Control()
-    private SimpleDBControl _simpleDbCtrl;
-
-    // initialize the PopulateDBCtrl
-    @Control()
-    private PopulateDBCtrl _popCtrl;
-
-    public transient String[] productNames;
-    public transient SimpleDBControl.Product productDetails;
-
-    @Jpf.Action(
-        forwards={
-           @Jpf.Forward(name="success", path="index.jsp")
-        }
-    )
-    protected Forward begin() {
-        return new Forward("success");
-    }
-
-    @Jpf.Action(
-        forwards={
-           @Jpf.Forward(name="success", path="demo.jsp"),
-           @Jpf.Forward(name="error", path="error.jsp")
-        }
-    )
-    protected Forward startDemo() {
-
-        try {
-            productNames = _simpleDbCtrl.getProductNames();
-        } catch (SQLException sqe) {
-            System.out.println("JdbcSampleApp: Error Calling Simpledb: " + sqe);
-            return new Forward("error");
-        }
-        return new Forward("success");
-    }
-
-    @Jpf.Action(
-        forwards={
-           @Jpf.Forward(name="details", path="details.jsp"),
-           @Jpf.Forward(name="error", path="error.jsp")
-        }
-    )
-    protected Forward productDetails() {
-        
-        try {
-            productDetails = _simpleDbCtrl.getProductDetails(getRequest().getParameter("key"));
-        } catch (SQLException sqe) {
-            System.out.println("JdbcSampleApp: Error Calling Simpledb: " + sqe);
-            return new Forward("error");
-        }
-        return new Forward("details");
-    }
-
-    /**
-     * Callback that is invoked when this controller instance is created.
-     */
-    protected void onCreate()
-    {
-        String check = null;
-
-        try {
-            Class.forName("org.apache.derby.jdbc.EmbeddedDriver"); 
-        } catch (ClassNotFoundException e) {
-            System.out.println("JdbcSampleApp: Class Not Found: " + e);
-            return;
-        }
-
-        System.out.println("jdbcControlSample: checking to see if products table exists...");
-        try {
-            check = _popCtrl.isProductsTableEmpty();
-        } catch (SQLException sqe) { 
-        }
-
-        // table has been loaded -- just return
-        if (check != null) {
-           System.out.println("jdbcControlSample: products table exists.");
-           return;
-        }
-
-        System.out.println("jdbcControlSample: products table does not exist, creating...");
-        try {
-            _popCtrl.createProductsTable();
-            _popCtrl.addProductRow("apple", "red apples", 200);
-            _popCtrl.addProductRow("orange", "orange oranges", 400);
-            _popCtrl.addProductRow("kiwi", "lots of kiwi", 800);
-            _popCtrl.addProductRow("banana", "yellow", 123);
-            _popCtrl.addProductRow("coconut", "coconutty", 21);
-            _popCtrl.addProductRow("plum", "lots of plums", 999);
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Callback that is invoked when this controller instance is destroyed.
-     */
-    protected void onDestroy(HttpSession session)
-    {
-    }
-}
+import javax.servlet.http.HttpSession;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import javax.servlet.http.HttpServletRequest;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import org.apache.beehive.controls.api.bean.Control;
+import controls.SimpleDBControl;
+import controls.PopulateDBCtrl;
+import shared.SharedFlow;
+
+@Jpf.Controller(
+    simpleActions={},
+    sharedFlowRefs={
+        @Jpf.SharedFlowRef(name="shared", type=shared.SharedFlow.class)
+    }
+)
+public class Controller 
+    extends PageFlowController
+{
+    @Jpf.SharedFlowField(name="shared")
+    private shared.SharedFlow sharedFlow;
+
+    // initialize the SimpleDBCtrl
+    @Control()
+    private SimpleDBControl _simpleDbCtrl;
+
+    // initialize the PopulateDBCtrl
+    @Control()
+    private PopulateDBCtrl _popCtrl;
+
+    public transient String[] productNames;
+    public transient SimpleDBControl.Product productDetails;
+
+    @Jpf.Action(
+        forwards={
+           @Jpf.Forward(name="success", path="index.jsp")
+        }
+    )
+    protected Forward begin() {
+        return new Forward("success");
+    }
+
+    @Jpf.Action(
+        forwards={
+           @Jpf.Forward(name="success", path="demo.jsp"),
+           @Jpf.Forward(name="error", path="error.jsp")
+        }
+    )
+    protected Forward startDemo() {
+
+        try {
+            productNames = _simpleDbCtrl.getProductNames();
+        } catch (SQLException sqe) {
+            System.out.println("JdbcSampleApp: Error Calling Simpledb: " + sqe);
+            return new Forward("error");
+        }
+        return new Forward("success");
+    }
+
+    @Jpf.Action(
+        forwards={
+           @Jpf.Forward(name="details", path="details.jsp"),
+           @Jpf.Forward(name="error", path="error.jsp")
+        }
+    )
+    protected Forward productDetails() {
+        
+        try {
+            productDetails = _simpleDbCtrl.getProductDetails(getRequest().getParameter("key"));
+        } catch (SQLException sqe) {
+            System.out.println("JdbcSampleApp: Error Calling Simpledb: " + sqe);
+            return new Forward("error");
+        }
+        return new Forward("details");
+    }
+
+    /**
+     * Callback that is invoked when this controller instance is created.
+     */
+    protected void onCreate()
+    {
+        String check = null;
+
+        try {
+            Class.forName("org.apache.derby.jdbc.EmbeddedDriver"); 
+        } catch (ClassNotFoundException e) {
+            System.out.println("JdbcSampleApp: Class Not Found: " + e);
+            return;
+        }
+
+        System.out.println("jdbcControlSample: checking to see if products table exists...");
+        try {
+            check = _popCtrl.isProductsTableEmpty();
+        } catch (SQLException sqe) { 
+        }
+
+        // table has been loaded -- just return
+        if (check != null) {
+           System.out.println("jdbcControlSample: products table exists.");
+           return;
+        }
+
+        System.out.println("jdbcControlSample: products table does not exist, creating...");
+        try {
+            _popCtrl.createProductsTable();
+            _popCtrl.addProductRow("apple", "red apples", 200);
+            _popCtrl.addProductRow("orange", "orange oranges", 400);
+            _popCtrl.addProductRow("kiwi", "lots of kiwi", 800);
+            _popCtrl.addProductRow("banana", "yellow", 123);
+            _popCtrl.addProductRow("coconut", "coconutty", 21);
+            _popCtrl.addProductRow("plum", "lots of plums", 999);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Callback that is invoked when this controller instance is destroyed.
+     */
+    protected void onDestroy(HttpSession session)
+    {
+    }
+}

Propchange: incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/Controller.jpf
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/META-INF/context.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/META-INF/context.xml?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/META-INF/context.xml (original)
+++ incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/META-INF/context.xml Tue Jun 14 14:14:42 2005
@@ -1,53 +1,53 @@
-<?xml version='1.0' encoding='utf-8'?>
-
-<Context path="/JdbcControlSample" docBase="/d:/beeline/samples/jdbcControlSample" debug="5" reloadable="true" crossContext="true">
-
-  <Logger className="org.apache.catalina.logger.FileLogger" prefix="localhost_dataWeb_log." suffix=".txt" timestamp="true"/>
-
-  <Resource name="jdbc/JdbcControlSampleDB" auth="Container" type="javax.sql.DataSource"/>
-
-  <ResourceParams name="jdbc/JdbcControlSampleDB">
-          
-    <parameter>
-      <name>factory</name>
-      <value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
-    </parameter>
-
-    <parameter>
-       <name>driverClassName</name>
-       <value>org.apache.derby.jdbc.EmbeddedDriver</value>
-    </parameter>
-
-    <parameter>
-      <name>url</name>
-      <value>jdbc:derby:JdbcControlSampleDB;create=true</value>
-    </parameter>
-
-        <!-- Maximum number of dB connections in pool. Make sure you
-         configure your mysqld max_connections large enough to handle
-         all of your db connections. Set to 0 for no limit.
-         -->
-    <parameter>
-      <name>maxActive</name>
-      <value>100</value>
-    </parameter>
-
-    <!-- Maximum number of idle dB connections to retain in pool.
-         Set to 0 for no limit.
-         -->
-    <parameter>
-      <name>maxIdle</name>
-      <value>30</value>
-    </parameter>
-
-    <!-- Maximum time to wait for a dB connection to become available
-         in ms, in this example 10 seconds. An Exception is thrown if
-         this timeout is exceeded.  Set to -1 to wait indefinitely.
-         -->
-    <parameter>
-      <name>maxWait</name>
-      <value>10000</value>
-    </parameter>
-
-  </ResourceParams>
-</Context>
+<?xml version='1.0' encoding='utf-8'?>
+
+<Context path="/JdbcControlSample" docBase="/d:/beeline/samples/jdbcControlSample" debug="5" reloadable="true" crossContext="true">
+
+  <Logger className="org.apache.catalina.logger.FileLogger" prefix="localhost_dataWeb_log." suffix=".txt" timestamp="true"/>
+
+  <Resource name="jdbc/JdbcControlSampleDB" auth="Container" type="javax.sql.DataSource"/>
+
+  <ResourceParams name="jdbc/JdbcControlSampleDB">
+          
+    <parameter>
+      <name>factory</name>
+      <value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
+    </parameter>
+
+    <parameter>
+       <name>driverClassName</name>
+       <value>org.apache.derby.jdbc.EmbeddedDriver</value>
+    </parameter>
+
+    <parameter>
+      <name>url</name>
+      <value>jdbc:derby:JdbcControlSampleDB;create=true</value>
+    </parameter>
+
+        <!-- Maximum number of dB connections in pool. Make sure you
+         configure your mysqld max_connections large enough to handle
+         all of your db connections. Set to 0 for no limit.
+         -->
+    <parameter>
+      <name>maxActive</name>
+      <value>100</value>
+    </parameter>
+
+    <!-- Maximum number of idle dB connections to retain in pool.
+         Set to 0 for no limit.
+         -->
+    <parameter>
+      <name>maxIdle</name>
+      <value>30</value>
+    </parameter>
+
+    <!-- Maximum time to wait for a dB connection to become available
+         in ms, in this example 10 seconds. An Exception is thrown if
+         this timeout is exceeded.  Set to -1 to wait indefinitely.
+         -->
+    <parameter>
+      <name>maxWait</name>
+      <value>10000</value>
+    </parameter>
+
+  </ResourceParams>
+</Context>

Propchange: incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/META-INF/context.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/build.properties
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/build.properties?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/build.properties (original)
+++ incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/build.properties Tue Jun 14 14:14:42 2005
@@ -1,9 +1,9 @@
-#
-#
-#
-beehive.home=../../../..
-
-servlet-api.jar=${os.CATALINA_HOME}/common/lib/servlet-api.jar
-jsp-api.jar=${os.CATALINA_HOME}/common/lib/jsp-api.jar
-
-context.path=netui-blank
+#
+#
+#
+beehive.home=../../../..
+
+servlet-api.jar=${os.CATALINA_HOME}/common/lib/servlet-api.jar
+jsp-api.jar=${os.CATALINA_HOME}/common/lib/jsp-api.jar
+
+context.path=netui-blank

Propchange: incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/build.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/build.xml?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/build.xml (original)
+++ incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/build.xml Tue Jun 14 14:14:42 2005
@@ -1,120 +1,120 @@
-<?xml version="1.0"?>
-<!--
-   Copyright 2004 The Apache Software Foundation.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-   
-       http://www.apache.org/licenses/LICENSE-2.0
-   
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-  
-   $Header:$
- -->
-
-<!--
-  An Ant build file for compiling a Beehive page flow web application.
--->
-<project name="Beehive/Samples/netui-blank" default="usage" basedir="../..">
-
-    <property environment="os"/>
-    <property file="${basedir}/WEB-INF/src/build.properties"/>
-
-    <import file="${beehive.home}/beehive-imports.xml"/>
-    <import file="${beehive.home}/ant/beehive-tools.xml"/>
-
-    <property name="webapp.dir" location="${basedir}"/>
-
-    <property name="tmp.sourcegen.dir" value=".tmpbeansrc"/>
-    <property name="tmp.jpfgen.dir" value=".pageflow-struts-generated"/>
-
-    <!-- Define the classpath used to build the webapp -->
-    <path id="webapp.build.classpath">
-        <pathelement location="${servlet-api.jar}"/>
-        <pathelement location="${jsp-api.jar}"/>
-        <pathelement location="${webapp.dir}/WEB-INF/classes"/>
-        <fileset dir="${webapp.dir}/WEB-INF/lib">
-            <include name="*.jar"/>
-        </fileset>
-    </path>    
-
-    <target name="deploy-beehive" description="Copy the Beehive page flow and web service rutime into the target webapp">
-        <deploy-netui webappDir="${webapp.dir}"/>
-        <deploy-wsm webappDir="${webapp.dir}"/>
-    </target>
-
-    <target name="build" depends="deploy-beehive" description="Build the webapp">
-        <available property="webapp.dir.available" file="${webapp.dir}" type="dir"/>
-        <fail unless="webapp.dir.available" message="Can't find the webapp directory ${webapp.dir}"/>
-
-        <!-- 
-            this directory needs to get whacked before every build so 
-            that control interface repackagings don't cause stale
-            files to be compiled 
-          -->
-        <delete dir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}" includeEmptyDirs="true"/>
-
-        <mkdir dir="${webapp.dir}/WEB-INF/classes"/>
-
-        <!-- compile XSDs -->
-        <build-schemas srcdir="${webapp.dir}/WEB-INF/schemas" destdir="${webapp.dir}/WEB-INF/classes"/>
-
-        <!-- compile controls -->
-        <build-controls srcdir="${webapp.dir}/WEB-INF/src" 
-                        destdir="${webapp.dir}/WEB-INF/classes" 
-                        tempdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
-                        classpathref="webapp.build.classpath"/>
-
-        <!-- compile JPFs -->
-        <build-pageflows srcdir="${webapp.dir}" 
-                         weboutputdir="${webapp.dir}" 
-                         classoutputdir="${webapp.dir}/WEB-INF/classes" 
-                         tempdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
-                         classpathref="webapp.build.classpath"/>
-
-        <!-- copy resources -->
-  	<echo>Copy all .properties and .xml files</echo>
-        <copy todir="${webapp.dir}/WEB-INF/classes">
-            <fileset dir="${webapp.dir}/WEB-INF/src" includes="**/*.properties"/>
-            <fileset dir="${webapp.dir}/WEB-INF/src" includes="**/*.xml"/>
-        </copy>
-    </target>
-
-    <target name="clean" description="Clean the webapp">
-        <delete dir="${webapp.dir}/WEB-INF/classes" includeEmptyDirs="true"/>
-        <delete dir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}" includeEmptyDirs="true"/>
-        <delete dir="${webapp.dir}/WEB-INF/${tmp.jpfgen.dir}" includeEmptyDirs="true"/>
-    </target>
-
-    <target name="war" description="Build a compressed WAR file that can be deployed to an application container">
-        <property name="archive.dir" value="${webapp.dir}/.."/>
-
-        <!-- this does *not* exclude source from the archive -->
-        <war destfile="${archive.dir}/${context.path}.war" webxml="${webapp.dir}/WEB-INF/web.xml">
-            <fileset dir="${webapp.dir}">
-                <exclude name="WEB-INF/web.xml"/>
-                <exclude name="WEB-INF/src/**"/>
-            </fileset>
-        </war>
-    </target>
-
-    <target name="usage" description="Print usage information for this build file">
-        <echo>
-To run the webapp, two steps need to occur:
-- copy the Beehive runtime to the webapp
-- build the webapp
-
-Once the webapp is built, it's ready to deploy onto your application container.
-        </echo>
-
-        <java fork="no" classname="org.apache.tools.ant.Main">
-            <arg line="-f ${ant.file} -projecthelp"/>
-        </java>
-    </target>
-
-</project>
+<?xml version="1.0"?>
+<!--
+   Copyright 2004 The Apache Software Foundation.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+   
+       http://www.apache.org/licenses/LICENSE-2.0
+   
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  
+   $Header:$
+ -->
+
+<!--
+  An Ant build file for compiling a Beehive page flow web application.
+-->
+<project name="Beehive/Samples/netui-blank" default="usage" basedir="../..">
+
+    <property environment="os"/>
+    <property file="${basedir}/WEB-INF/src/build.properties"/>
+
+    <import file="${beehive.home}/beehive-imports.xml"/>
+    <import file="${beehive.home}/ant/beehive-tools.xml"/>
+
+    <property name="webapp.dir" location="${basedir}"/>
+
+    <property name="tmp.sourcegen.dir" value=".tmpbeansrc"/>
+    <property name="tmp.jpfgen.dir" value=".pageflow-struts-generated"/>
+
+    <!-- Define the classpath used to build the webapp -->
+    <path id="webapp.build.classpath">
+        <pathelement location="${servlet-api.jar}"/>
+        <pathelement location="${jsp-api.jar}"/>
+        <pathelement location="${webapp.dir}/WEB-INF/classes"/>
+        <fileset dir="${webapp.dir}/WEB-INF/lib">
+            <include name="*.jar"/>
+        </fileset>
+    </path>    
+
+    <target name="deploy-beehive" description="Copy the Beehive page flow and web service rutime into the target webapp">
+        <deploy-netui webappDir="${webapp.dir}"/>
+        <deploy-wsm webappDir="${webapp.dir}"/>
+    </target>
+
+    <target name="build" depends="deploy-beehive" description="Build the webapp">
+        <available property="webapp.dir.available" file="${webapp.dir}" type="dir"/>
+        <fail unless="webapp.dir.available" message="Can't find the webapp directory ${webapp.dir}"/>
+
+        <!-- 
+            this directory needs to get whacked before every build so 
+            that control interface repackagings don't cause stale
+            files to be compiled 
+          -->
+        <delete dir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}" includeEmptyDirs="true"/>
+
+        <mkdir dir="${webapp.dir}/WEB-INF/classes"/>
+
+        <!-- compile XSDs -->
+        <build-schemas srcdir="${webapp.dir}/WEB-INF/schemas" destdir="${webapp.dir}/WEB-INF/classes"/>
+
+        <!-- compile controls -->
+        <build-controls srcdir="${webapp.dir}/WEB-INF/src" 
+                        destdir="${webapp.dir}/WEB-INF/classes" 
+                        tempdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
+                        classpathref="webapp.build.classpath"/>
+
+        <!-- compile JPFs -->
+        <build-pageflows srcdir="${webapp.dir}" 
+                         weboutputdir="${webapp.dir}" 
+                         classoutputdir="${webapp.dir}/WEB-INF/classes" 
+                         tempdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
+                         classpathref="webapp.build.classpath"/>
+
+        <!-- copy resources -->
+  	<echo>Copy all .properties and .xml files</echo>
+        <copy todir="${webapp.dir}/WEB-INF/classes">
+            <fileset dir="${webapp.dir}/WEB-INF/src" includes="**/*.properties"/>
+            <fileset dir="${webapp.dir}/WEB-INF/src" includes="**/*.xml"/>
+        </copy>
+    </target>
+
+    <target name="clean" description="Clean the webapp">
+        <delete dir="${webapp.dir}/WEB-INF/classes" includeEmptyDirs="true"/>
+        <delete dir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}" includeEmptyDirs="true"/>
+        <delete dir="${webapp.dir}/WEB-INF/${tmp.jpfgen.dir}" includeEmptyDirs="true"/>
+    </target>
+
+    <target name="war" description="Build a compressed WAR file that can be deployed to an application container">
+        <property name="archive.dir" value="${webapp.dir}/.."/>
+
+        <!-- this does *not* exclude source from the archive -->
+        <war destfile="${archive.dir}/${context.path}.war" webxml="${webapp.dir}/WEB-INF/web.xml">
+            <fileset dir="${webapp.dir}">
+                <exclude name="WEB-INF/web.xml"/>
+                <exclude name="WEB-INF/src/**"/>
+            </fileset>
+        </war>
+    </target>
+
+    <target name="usage" description="Print usage information for this build file">
+        <echo>
+To run the webapp, two steps need to occur:
+- copy the Beehive runtime to the webapp
+- build the webapp
+
+Once the webapp is built, it's ready to deploy onto your application container.
+        </echo>
+
+        <java fork="no" classname="org.apache.tools.ant.Main">
+            <arg line="-f ${ant.file} -projecthelp"/>
+        </java>
+    </target>
+
+</project>

Propchange: incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/controls/PopulateDBCtrl.jcx
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/controls/PopulateDBCtrl.jcx?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/controls/PopulateDBCtrl.jcx (original)
+++ incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/controls/PopulateDBCtrl.jcx Tue Jun 14 14:14:42 2005
@@ -1,54 +1,54 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-package controls; 
-
-import java.sql.SQLException; 
-import java.sql.ResultSet;
-import org.apache.beehive.controls.system.jdbc.JdbcControl;
-
-/** 
- * This Jdbc Control is used to populate the sample database.
- */ 
-@org.apache.beehive.controls.api.bean.ControlExtension
-@JdbcControl.ConnectionDataSource(jndiName="java:comp/env/jdbc/JdbcControlSampleDB")
-public interface PopulateDBCtrl extends JdbcControl
-{ 
-    /**
-     * Create the products table in the database.
-     */
-    @JdbcControl.SQL(statement="CREATE TABLE products (name VARCHAR(64), description VARCHAR(128), quantity INT)")
-    public void createProductsTable() throws SQLException;
-
-    /**
-     * Add a row to the products table.
-     * @param name String
-     * @param description String 
-     * @param quantity int
-     */
-    @JdbcControl.SQL(statement="INSERT INTO products VALUES ({name}, {description}, {quantity})")
-    public void addProductRow(String name, String description, int quantity) throws SQLException;
-
-    /**
-     * Returns the number of rows in the products table.  
-     * @return 
-     */
-    @JdbcControl.SQL(statement="SELECT name FROM products WHERE name='apple'")
-    public String isProductsTableEmpty() throws SQLException;
-    
-    static final long serialVersionUID = 1L;
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package controls; 
+
+import java.sql.SQLException; 
+import java.sql.ResultSet;
+import org.apache.beehive.controls.system.jdbc.JdbcControl;
+
+/** 
+ * This Jdbc Control is used to populate the sample database.
+ */ 
+@org.apache.beehive.controls.api.bean.ControlExtension
+@JdbcControl.ConnectionDataSource(jndiName="java:comp/env/jdbc/JdbcControlSampleDB")
+public interface PopulateDBCtrl extends JdbcControl
+{ 
+    /**
+     * Create the products table in the database.
+     */
+    @JdbcControl.SQL(statement="CREATE TABLE products (name VARCHAR(64), description VARCHAR(128), quantity INT)")
+    public void createProductsTable() throws SQLException;
+
+    /**
+     * Add a row to the products table.
+     * @param name String
+     * @param description String 
+     * @param quantity int
+     */
+    @JdbcControl.SQL(statement="INSERT INTO products VALUES ({name}, {description}, {quantity})")
+    public void addProductRow(String name, String description, int quantity) throws SQLException;
+
+    /**
+     * Returns the number of rows in the products table.  
+     * @return 
+     */
+    @JdbcControl.SQL(statement="SELECT name FROM products WHERE name='apple'")
+    public String isProductsTableEmpty() throws SQLException;
+    
+    static final long serialVersionUID = 1L;
+}

Propchange: incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/controls/PopulateDBCtrl.jcx
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/controls/SimpleDBControl.jcx
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/controls/SimpleDBControl.jcx?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/controls/SimpleDBControl.jcx (original)
+++ incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/controls/SimpleDBControl.jcx Tue Jun 14 14:14:42 2005
@@ -1,64 +1,64 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-package controls; 
-
-import java.sql.SQLException; 
-import java.sql.ResultSet;
-import org.apache.beehive.controls.system.jdbc.JdbcControl;
-
-/** 
- * JdbcControl implementation for the JdbcControl sample app.
- */ 
-@org.apache.beehive.controls.api.bean.ControlExtension
-@JdbcControl.ConnectionDataSource(jndiName="java:comp/env/jdbc/JdbcControlSampleDB")
-public interface SimpleDBControl extends JdbcControl
-{ 
-
-    static public class Product 
-    { 
-        private String _name; 
-        private String _description;
-        private int _quantity; 
-
-        public int getQuantity() { return _quantity; }
-        public void setQuantity(int i) { _quantity = i; }
-
-        public String getName() { return _name; }
-        public void setName(String n) { _name = n; }
-
-        public String getDescription() { return _description; }
-        public void setDescription(String n) { _description = n; }
-    }
-
-    /**
-     * Get the name column from the products table.
-     * @return An array of strings.
-     */
-    @JdbcControl.SQL(statement="SELECT name FROM products")
-    public String[] getProductNames() throws SQLException;
-
-    /**
-     * Get the rest of the columns associated with a product name.
-     * @param productName Name of product to lookup.
-     * @return An instance of Product.
-     */
-    @JdbcControl.SQL(statement="SELECT * FROM products WHERE name={productName}")
-    public Product getProductDetails(String productName) throws SQLException;
-   
-    static final long serialVersionUID = 1L;
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package controls; 
+
+import java.sql.SQLException; 
+import java.sql.ResultSet;
+import org.apache.beehive.controls.system.jdbc.JdbcControl;
+
+/** 
+ * JdbcControl implementation for the JdbcControl sample app.
+ */ 
+@org.apache.beehive.controls.api.bean.ControlExtension
+@JdbcControl.ConnectionDataSource(jndiName="java:comp/env/jdbc/JdbcControlSampleDB")
+public interface SimpleDBControl extends JdbcControl
+{ 
+
+    static public class Product 
+    { 
+        private String _name; 
+        private String _description;
+        private int _quantity; 
+
+        public int getQuantity() { return _quantity; }
+        public void setQuantity(int i) { _quantity = i; }
+
+        public String getName() { return _name; }
+        public void setName(String n) { _name = n; }
+
+        public String getDescription() { return _description; }
+        public void setDescription(String n) { _description = n; }
+    }
+
+    /**
+     * Get the name column from the products table.
+     * @return An array of strings.
+     */
+    @JdbcControl.SQL(statement="SELECT name FROM products")
+    public String[] getProductNames() throws SQLException;
+
+    /**
+     * Get the rest of the columns associated with a product name.
+     * @param productName Name of product to lookup.
+     * @return An instance of Product.
+     */
+    @JdbcControl.SQL(statement="SELECT * FROM products WHERE name={productName}")
+    public Product getProductDetails(String productName) throws SQLException;
+   
+    static final long serialVersionUID = 1L;
+}

Propchange: incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/controls/SimpleDBControl.jcx
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/servlet/DerbyListener.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/servlet/DerbyListener.java?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/servlet/DerbyListener.java (original)
+++ incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/servlet/DerbyListener.java Tue Jun 14 14:14:42 2005
@@ -1,53 +1,53 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-package servlet;
-
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletContextEvent;
-
-import org.apache.beehive.netui.util.logging.Logger;
-
-/**
- *
- */
-public class DerbyListener implements ServletContextListener {
-
-    private static final Logger LOGGER = Logger.getInstance(DerbyListener.class);
-    private static final String _dbUrlStr = "jdbc:derby:JdbcControlSampleDB";
-
-    public void contextInitialized(ServletContextEvent event) {
-        try {
-            Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
-        } catch(Exception e) {
-            assert e instanceof ClassNotFoundException;
-            e.printStackTrace();
-            LOGGER.error("Exception occurred starting webapp context.  Cause: " + e.getMessage(), e);
-        }
-    }
-
-    public void contextDestroyed(ServletContextEvent event) {
-        try {
-            DriverManager.getConnection(_dbUrlStr + ";shudown=true");
-        } catch(SQLException sql) {
-            sql.printStackTrace();
-            LOGGER.error("Exception occurred stopping webapp context.  Cause: " + sql.getMessage(), sql);
-        }
-    }
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package servlet;
+
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletContextEvent;
+
+import org.apache.beehive.netui.util.logging.Logger;
+
+/**
+ *
+ */
+public class DerbyListener implements ServletContextListener {
+
+    private static final Logger LOGGER = Logger.getInstance(DerbyListener.class);
+    private static final String _dbUrlStr = "jdbc:derby:JdbcControlSampleDB";
+
+    public void contextInitialized(ServletContextEvent event) {
+        try {
+            Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
+        } catch(Exception e) {
+            assert e instanceof ClassNotFoundException;
+            e.printStackTrace();
+            LOGGER.error("Exception occurred starting webapp context.  Cause: " + e.getMessage(), e);
+        }
+    }
+
+    public void contextDestroyed(ServletContextEvent event) {
+        try {
+            DriverManager.getConnection(_dbUrlStr + ";shudown=true");
+        } catch(SQLException sql) {
+            sql.printStackTrace();
+            LOGGER.error("Exception occurred stopping webapp context.  Cause: " + sql.getMessage(), sql);
+        }
+    }
+}

Propchange: incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/servlet/DerbyListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/shared/SharedFlow.jpfs
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/shared/SharedFlow.jpfs?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/shared/SharedFlow.jpfs (original)
+++ incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/shared/SharedFlow.jpfs Tue Jun 14 14:14:42 2005
@@ -1,85 +1,85 @@
-package shared;
-
-import java.io.IOException;
-
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.PageFlowException;
-import org.apache.beehive.netui.pageflow.SharedFlowController;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-
-/**
- * This shared flow can define actions, exception handlers, and state to be shared among page flows
- * that reference it.  A page flow references this shared flow inside a <code>Jpf.Controller</code>
- * annotation as:
- * <pre>
- *     sharedFlowRefs={
- *         &#064;Jpf.SharedFlowRef(name="shared", type=shared.SharedFlow.class)
- *     }
- * </pre>
- * 
- * Once referenced, the following features apply:
- *    <ul>
- *        <li>
- *            An instance of this shared flow will be created and stored the first time the page
- *            flow is accessed.
- *        </li>
- *        <li>
- *            The page flow (or its pages) can reference actions using the pattern
- *            <i>shared-flow-name.action-name</i>, e.g., "shared.someAction".
- *        </li>
- *        <li>
- *            Unhandled exceptions in the page flow will be handled by <code>Jpf.Catch</code>
- *            annotations in this shared flow.
- *        </li>
- *        <li>
- *            In pages and annotations that bind to data using the expression language, properties
- *            in this shared flow are accessed through the <code>sharedFlow</code> binding context.
- *        </li>
- *        <li>
- *            A page flow can have an automatically-initialized member reference to this shared
- *            flow using the <code>Jpf.SharedFlowField</code> annotation, like this:
- *            <pre>
- *                &#064;Jpf.SharedFlowField(name="shared")
- *                private shared.SharedFlow _mySharedFlowReference;
- *            </pre>
- *        </li>
- *    </ul>
- */
-@Jpf.Controller(
-    catches={
-       @Jpf.Catch(type=PageFlowException.class, method="handlePageFlowException"),
-       @Jpf.Catch(type=Exception.class, method="handleException")
-    }
-)
-public class SharedFlow
-    extends SharedFlowController
-{
-    @Jpf.ExceptionHandler(
-        forwards={
-            @Jpf.Forward(name="errorPage", path="/error.jsp")
-        }
-    )
-    protected Forward handleException(Exception ex, String actionName, String message, Object form)
-    {
-        System.err.print("[" + getRequest().getContextPath() + "] ");
-        System.err.println("Unhandled exception caught in shared flow " + getDisplayName() + ":");
-        ex.printStackTrace();
-        return new Forward("errorPage");
-    }
-
-    /** 
-     * Handler for native page flow exceptions (e.g., ActionNotFoundException, which is thrown when
-     * an unknown page flow action is requested).  This handler allows these exceptions to write
-     * informative error pages to the response when the server is not in production mode, and it
-     * allows them to send an appropriate error on the response when the server is in production
-     * mode.  To use the standard exception handler for these exceptions, simply remove this method
-     * and the Jpf.Catch annotation that references it.
-     */
-    @Jpf.ExceptionHandler
-    public Forward handlePageFlowException(PageFlowException ex, String actionName, String message, Object form) 
-        throws IOException
-    { 
-        ex.sendError(getRequest(), getResponse()); 
-        return null; 
-    } 
-}
+package shared;
+
+import java.io.IOException;
+
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowException;
+import org.apache.beehive.netui.pageflow.SharedFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+/**
+ * This shared flow can define actions, exception handlers, and state to be shared among page flows
+ * that reference it.  A page flow references this shared flow inside a <code>Jpf.Controller</code>
+ * annotation as:
+ * <pre>
+ *     sharedFlowRefs={
+ *         &#064;Jpf.SharedFlowRef(name="shared", type=shared.SharedFlow.class)
+ *     }
+ * </pre>
+ * 
+ * Once referenced, the following features apply:
+ *    <ul>
+ *        <li>
+ *            An instance of this shared flow will be created and stored the first time the page
+ *            flow is accessed.
+ *        </li>
+ *        <li>
+ *            The page flow (or its pages) can reference actions using the pattern
+ *            <i>shared-flow-name.action-name</i>, e.g., "shared.someAction".
+ *        </li>
+ *        <li>
+ *            Unhandled exceptions in the page flow will be handled by <code>Jpf.Catch</code>
+ *            annotations in this shared flow.
+ *        </li>
+ *        <li>
+ *            In pages and annotations that bind to data using the expression language, properties
+ *            in this shared flow are accessed through the <code>sharedFlow</code> binding context.
+ *        </li>
+ *        <li>
+ *            A page flow can have an automatically-initialized member reference to this shared
+ *            flow using the <code>Jpf.SharedFlowField</code> annotation, like this:
+ *            <pre>
+ *                &#064;Jpf.SharedFlowField(name="shared")
+ *                private shared.SharedFlow _mySharedFlowReference;
+ *            </pre>
+ *        </li>
+ *    </ul>
+ */
+@Jpf.Controller(
+    catches={
+       @Jpf.Catch(type=PageFlowException.class, method="handlePageFlowException"),
+       @Jpf.Catch(type=Exception.class, method="handleException")
+    }
+)
+public class SharedFlow
+    extends SharedFlowController
+{
+    @Jpf.ExceptionHandler(
+        forwards={
+            @Jpf.Forward(name="errorPage", path="/error.jsp")
+        }
+    )
+    protected Forward handleException(Exception ex, String actionName, String message, Object form)
+    {
+        System.err.print("[" + getRequest().getContextPath() + "] ");
+        System.err.println("Unhandled exception caught in shared flow " + getDisplayName() + ":");
+        ex.printStackTrace();
+        return new Forward("errorPage");
+    }
+
+    /** 
+     * Handler for native page flow exceptions (e.g., ActionNotFoundException, which is thrown when
+     * an unknown page flow action is requested).  This handler allows these exceptions to write
+     * informative error pages to the response when the server is not in production mode, and it
+     * allows them to send an appropriate error on the response when the server is in production
+     * mode.  To use the standard exception handler for these exceptions, simply remove this method
+     * and the Jpf.Catch annotation that references it.
+     */
+    @Jpf.ExceptionHandler
+    public Forward handlePageFlowException(PageFlowException ex, String actionName, String message, Object form) 
+        throws IOException
+    { 
+        ex.sendError(getRequest(), getResponse()); 
+        return null; 
+    } 
+}

Propchange: incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/shared/SharedFlow.jpfs
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/web.xml?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/web.xml (original)
+++ incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/web.xml Tue Jun 14 14:14:42 2005
@@ -1,100 +1,100 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-    version="2.4">
-
-    <display-name>Beehive Web Application</display-name>
-
-    <filter>
-        <filter-name>PageFlowJspFilter</filter-name>
-        <filter-class>org.apache.beehive.netui.pageflow.PageFlowJspFilter</filter-class>
-    </filter>
-
-    <filter>
-        <filter-name>PageFlowFacesFilter</filter-name>
-        <filter-class>org.apache.beehive.netui.pageflow.PageFlowFacesFilter</filter-class>
-    </filter>
-
-    <filter-mapping>
-        <filter-name>PageFlowJspFilter</filter-name>
-        <url-pattern>*.jsp</url-pattern>
-        <dispatcher>FORWARD</dispatcher>
-        <dispatcher>REQUEST</dispatcher>
-        <dispatcher>INCLUDE</dispatcher>
-    </filter-mapping>
-
-    <filter-mapping>
-        <filter-name>PageFlowJspFilter</filter-name>
-        <url-pattern>*.jspx</url-pattern>
-        <dispatcher>FORWARD</dispatcher>
-        <dispatcher>REQUEST</dispatcher>
-        <dispatcher>INCLUDE</dispatcher>
-    </filter-mapping>
-
-    <filter-mapping>
-        <filter-name>PageFlowFacesFilter</filter-name>
-        <url-pattern>*.faces</url-pattern>
-        <dispatcher>FORWARD</dispatcher>
-        <dispatcher>REQUEST</dispatcher>
-        <dispatcher>INCLUDE</dispatcher>
-    </filter-mapping>
-
-    <filter-mapping>
-        <filter-name>PageFlowFacesFilter</filter-name>
-        <url-pattern>*.jsf</url-pattern>
-        <dispatcher>FORWARD</dispatcher>
-        <dispatcher>REQUEST</dispatcher>
-        <dispatcher>INCLUDE</dispatcher>
-    </filter-mapping>
-
-    <!-- Action Servlet Configuration (with debugging) -->
-    <servlet>
-        <servlet-name>action</servlet-name>
-        <servlet-class>org.apache.beehive.netui.pageflow.PageFlowActionServlet</servlet-class>
-        <init-param>
-            <param-name>config</param-name>
-            <param-value>/WEB-INF/.pageflow-struts-generated/jpf-struts-config.xml</param-value>
-        </init-param>
-        <init-param>
-            <param-name>debug</param-name>
-            <param-value>2</param-value>
-        </init-param>
-        <init-param>
-            <param-name>detail</param-name>
-            <param-value>2</param-value>
-        </init-param>
-        <load-on-startup>2</load-on-startup>
-    </servlet>
-
-    <!-- Struts Action Servlet Mappings -->
-    <!-- Note that because Struts takes the *last* mapping here as the extension to add to
-         actions posted from forms, we must have *.do come after *.jpf. -->
-    <servlet-mapping>
-        <servlet-name>action</servlet-name>
-        <url-pattern>*.jpf</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>action</servlet-name>
-        <url-pattern>*.do</url-pattern>
-    </servlet-mapping>
-
-    <welcome-file-list>
-        <welcome-file>index.jsp</welcome-file>
-    </welcome-file-list>
-
-    <error-page>
-        <error-code>500</error-code>
-        <location>/error.jsp</location>
-    </error-page>
-
-  <resource-ref>
-      <description>DB Connection</description>
-      <res-ref-name>jdbc/TestDB</res-ref-name>
-      <res-type>javax.sql.DataSource</res-type>
-      <res-auth>Container</res-auth>
-  </resource-ref>
-
-</web-app>
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+    version="2.4">
+
+    <display-name>Beehive Web Application</display-name>
+
+    <filter>
+        <filter-name>PageFlowJspFilter</filter-name>
+        <filter-class>org.apache.beehive.netui.pageflow.PageFlowJspFilter</filter-class>
+    </filter>
+
+    <filter>
+        <filter-name>PageFlowFacesFilter</filter-name>
+        <filter-class>org.apache.beehive.netui.pageflow.PageFlowFacesFilter</filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>PageFlowJspFilter</filter-name>
+        <url-pattern>*.jsp</url-pattern>
+        <dispatcher>FORWARD</dispatcher>
+        <dispatcher>REQUEST</dispatcher>
+        <dispatcher>INCLUDE</dispatcher>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>PageFlowJspFilter</filter-name>
+        <url-pattern>*.jspx</url-pattern>
+        <dispatcher>FORWARD</dispatcher>
+        <dispatcher>REQUEST</dispatcher>
+        <dispatcher>INCLUDE</dispatcher>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>PageFlowFacesFilter</filter-name>
+        <url-pattern>*.faces</url-pattern>
+        <dispatcher>FORWARD</dispatcher>
+        <dispatcher>REQUEST</dispatcher>
+        <dispatcher>INCLUDE</dispatcher>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>PageFlowFacesFilter</filter-name>
+        <url-pattern>*.jsf</url-pattern>
+        <dispatcher>FORWARD</dispatcher>
+        <dispatcher>REQUEST</dispatcher>
+        <dispatcher>INCLUDE</dispatcher>
+    </filter-mapping>
+
+    <!-- Action Servlet Configuration (with debugging) -->
+    <servlet>
+        <servlet-name>action</servlet-name>
+        <servlet-class>org.apache.beehive.netui.pageflow.PageFlowActionServlet</servlet-class>
+        <init-param>
+            <param-name>config</param-name>
+            <param-value>/WEB-INF/.pageflow-struts-generated/jpf-struts-config.xml</param-value>
+        </init-param>
+        <init-param>
+            <param-name>debug</param-name>
+            <param-value>2</param-value>
+        </init-param>
+        <init-param>
+            <param-name>detail</param-name>
+            <param-value>2</param-value>
+        </init-param>
+        <load-on-startup>2</load-on-startup>
+    </servlet>
+
+    <!-- Struts Action Servlet Mappings -->
+    <!-- Note that because Struts takes the *last* mapping here as the extension to add to
+         actions posted from forms, we must have *.do come after *.jpf. -->
+    <servlet-mapping>
+        <servlet-name>action</servlet-name>
+        <url-pattern>*.jpf</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>action</servlet-name>
+        <url-pattern>*.do</url-pattern>
+    </servlet-mapping>
+
+    <welcome-file-list>
+        <welcome-file>index.jsp</welcome-file>
+    </welcome-file-list>
+
+    <error-page>
+        <error-code>500</error-code>
+        <location>/error.jsp</location>
+    </error-page>
+
+  <resource-ref>
+      <description>DB Connection</description>
+      <res-ref-name>jdbc/TestDB</res-ref-name>
+      <res-type>javax.sql.DataSource</res-type>
+      <res-auth>Container</res-auth>
+  </resource-ref>
+
+</web-app>

Propchange: incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/demo.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/demo.jsp?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/demo.jsp (original)
+++ incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/demo.jsp Tue Jun 14 14:14:42 2005
@@ -1,71 +1,71 @@
-<%@ page language="java" contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
-
-<netui:html>
-
-  <head>
-    <title>JspControlApp Sample Application</title>
-    <netui:base/>
-    <style>
-
-.datagrid-header{
-    background-color: #eeeeee;
-}
-.datagrid-header-cel{
-    background-color: #f0f0f0;
-}
-.custom-datagrid-header-cell{
-    background-color: #0f0f0f;
-}
-.datagrid-data-cell{
-}
-.datagrid-even{
-    background-color: #ffffff;
-}
-.datagrid-even a {
-    text-decoration: none;
-    color: #000000;   
-}
-.datagrid-odd{
-    background-color: #ffffde;
-}
-.datagrid-odd a {
-    text-decoration: none;
-    color: #000000;
-}
-    </style>
-  </head>
-
-  <netui:body>
-
-      <h1>JdbcControl Sample</h1>
-      <p></p>
-      <p>This is a tiny sample application which uses a JdbcControl inside of a Beehive PageFlow. When 
-         this page is accessed for the first time, a small Derby database is created and populated by the 
-         JdbcControl PopulateDBCtrl.</p>
-
-      <p>The data grid of product names below has been provided by the SimpleJdbcCtrl's getProductNames() 
-         method. Clicking in the second column will trigger another call to the SimpleJdbcCtrl to get
-         more detailed information from the database for the selected item.</p>
-
-      <netui-data:dataGrid dataSource="pageFlow.productNames" name="productNameGrid">
-        <netui-data:configurePager disableDefaultPager="true"/>
-          <netui-data:header>
-            <netui-data:headerCell headerText="Product Name"/>
-            <netui-data:headerCell headerText="Detailed Product Information"/>
-          </netui-data:header>
-          <netui-data:rows>
-            <netui-data:spanCell value="${container.item}"/>
-            <netui-data:anchorCell action="productDetails" value="click for details...">
-              <netui:parameter name="key" value="${container.item}"/>
-            </netui-data:anchorCell>
-          </netui-data:rows>
-
-      </netui-data:dataGrid>
-
-
-  </netui:body>
-
-</netui:html>
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
+
+<netui:html>
+
+  <head>
+    <title>JspControlApp Sample Application</title>
+    <netui:base/>
+    <style>
+
+.datagrid-header{
+    background-color: #eeeeee;
+}
+.datagrid-header-cel{
+    background-color: #f0f0f0;
+}
+.custom-datagrid-header-cell{
+    background-color: #0f0f0f;
+}
+.datagrid-data-cell{
+}
+.datagrid-even{
+    background-color: #ffffff;
+}
+.datagrid-even a {
+    text-decoration: none;
+    color: #000000;   
+}
+.datagrid-odd{
+    background-color: #ffffde;
+}
+.datagrid-odd a {
+    text-decoration: none;
+    color: #000000;
+}
+    </style>
+  </head>
+
+  <netui:body>
+
+      <h1>JdbcControl Sample</h1>
+      <p></p>
+      <p>This is a tiny sample application which uses a JdbcControl inside of a Beehive PageFlow. When 
+         this page is accessed for the first time, a small Derby database is created and populated by the 
+         JdbcControl PopulateDBCtrl.</p>
+
+      <p>The data grid of product names below has been provided by the SimpleJdbcCtrl's getProductNames() 
+         method. Clicking in the second column will trigger another call to the SimpleJdbcCtrl to get
+         more detailed information from the database for the selected item.</p>
+
+      <netui-data:dataGrid dataSource="pageFlow.productNames" name="productNameGrid">
+        <netui-data:configurePager disableDefaultPager="true"/>
+          <netui-data:header>
+            <netui-data:headerCell headerText="Product Name"/>
+            <netui-data:headerCell headerText="Detailed Product Information"/>
+          </netui-data:header>
+          <netui-data:rows>
+            <netui-data:spanCell value="${container.item}"/>
+            <netui-data:anchorCell action="productDetails" value="click for details...">
+              <netui:parameter name="key" value="${container.item}"/>
+            </netui-data:anchorCell>
+          </netui-data:rows>
+
+      </netui-data:dataGrid>
+
+
+  </netui:body>
+
+</netui:html>

Propchange: incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/demo.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/details.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/details.jsp?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/details.jsp (original)
+++ incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/details.jsp Tue Jun 14 14:14:42 2005
@@ -1,62 +1,62 @@
-<%@ page language="java" contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
-
-<netui:html>
-  <head>
-    <title>JdbcControl Sample Application</title>
-    <netui:base/>
-    <style>
-.datagrid-header{
-    background-color: #eeeeee;
-}
-.datagrid-header-cel{
-    background-color: #f0f0f0;
-}
-.custom-datagrid-header-cell{
-    background-color: #0f0f0f;
-}
-.datagrid-data-cell{
-}
-.datagrid-even{
-    background-color: #ffffff;
-}
-.datagrid-even a {
-    text-decoration: none;
-    color: #000000;   
-}
-.datagrid-odd{
-    background-color: #ffffde;
-}
-.datagrid-odd a {
-    text-decoration: none;
-    color: #000000;
-}
-    </style>
-  </head>
-
-  <netui:body>
-      <p></p>
-      <p>This page displays additional data for the specified product name.  Data is retrieved from the database
-         by the JdbcControl SimpleDBControl.jcx using its getProductDetails() method.</p>
-      <p></p>
-
-      <netui-data:dataGrid dataSource="pageFlow.productDetails" name="productDetailsGrid">
-        <netui-data:configurePager disableDefaultPager="true"/>
-          <netui-data:header>
-            <netui-data:headerCell headerText="Product Name"/>
-            <netui-data:headerCell headerText="Product Description"/>
-            <netui-data:headerCell headerText="Quantity"/>
-          </netui-data:header>
-        <netui-data:rows>
-          <netui-data:spanCell value="${container.item.name}"/>
-          <netui-data:spanCell value="${container.item.description}"/>
-          <netui-data:spanCell value="${container.item.quantity}"/>
-        </netui-data:rows>
-      </netui-data:dataGrid>
-      <br>
-      <p><netui:anchor action="startDemo">back</netui:anchor></p>
-  </netui:body>
-
-</netui:html>
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
+
+<netui:html>
+  <head>
+    <title>JdbcControl Sample Application</title>
+    <netui:base/>
+    <style>
+.datagrid-header{
+    background-color: #eeeeee;
+}
+.datagrid-header-cel{
+    background-color: #f0f0f0;
+}
+.custom-datagrid-header-cell{
+    background-color: #0f0f0f;
+}
+.datagrid-data-cell{
+}
+.datagrid-even{
+    background-color: #ffffff;
+}
+.datagrid-even a {
+    text-decoration: none;
+    color: #000000;   
+}
+.datagrid-odd{
+    background-color: #ffffde;
+}
+.datagrid-odd a {
+    text-decoration: none;
+    color: #000000;
+}
+    </style>
+  </head>
+
+  <netui:body>
+      <p></p>
+      <p>This page displays additional data for the specified product name.  Data is retrieved from the database
+         by the JdbcControl SimpleDBControl.jcx using its getProductDetails() method.</p>
+      <p></p>
+
+      <netui-data:dataGrid dataSource="pageFlow.productDetails" name="productDetailsGrid">
+        <netui-data:configurePager disableDefaultPager="true"/>
+          <netui-data:header>
+            <netui-data:headerCell headerText="Product Name"/>
+            <netui-data:headerCell headerText="Product Description"/>
+            <netui-data:headerCell headerText="Quantity"/>
+          </netui-data:header>
+        <netui-data:rows>
+          <netui-data:spanCell value="${container.item.name}"/>
+          <netui-data:spanCell value="${container.item.description}"/>
+          <netui-data:spanCell value="${container.item.quantity}"/>
+        </netui-data:rows>
+      </netui-data:dataGrid>
+      <br>
+      <p><netui:anchor action="startDemo">back</netui:anchor></p>
+  </netui:body>
+
+</netui:html>

Propchange: incubator/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/details.jsp
------------------------------------------------------------------------------
    svn:eol-style = native