You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by bl...@apache.org on 2004/12/03 14:51:24 UTC
svn commit: r109675 - in incubator/directory/seda/branches/berin_api_proposal: . src/java/org/apache/directory/seda src/test/org/apache/directory/seda/test
Author: bloritsch
Date: Fri Dec 3 05:51:22 2004
New Revision: 109675
URL: http://svn.apache.org/viewcvs?view=rev&rev=109675
Log:
Update the Copyright with the boiler plate, and add the core NetworkEvent and ProtocolRouter objects
Added:
incubator/directory/seda/branches/berin_api_proposal/LICENSE.txt
incubator/directory/seda/branches/berin_api_proposal/NOTICE.txt
incubator/directory/seda/branches/berin_api_proposal/src/java/org/apache/directory/seda/NetworkEvent.java
incubator/directory/seda/branches/berin_api_proposal/src/java/org/apache/directory/seda/ProtocolRouter.java
incubator/directory/seda/branches/berin_api_proposal/src/test/org/apache/directory/seda/test/TestNetworkEvent.java
incubator/directory/seda/branches/berin_api_proposal/src/test/org/apache/directory/seda/test/TestProtocolRouter.java
Modified:
incubator/directory/seda/branches/berin_api_proposal/src/java/org/apache/directory/seda/PipelineUtil.java
incubator/directory/seda/branches/berin_api_proposal/src/java/org/apache/directory/seda/Stage.java
incubator/directory/seda/branches/berin_api_proposal/src/test/org/apache/directory/seda/test/TestPipelineUtil.java
incubator/directory/seda/branches/berin_api_proposal/src/test/org/apache/directory/seda/test/TestStage.java
Added: incubator/directory/seda/branches/berin_api_proposal/LICENSE.txt
Url: http://svn.apache.org/viewcvs/incubator/directory/seda/branches/berin_api_proposal/LICENSE.txt?view=auto&rev=109675
==============================================================================
--- (empty file)
+++ incubator/directory/seda/branches/berin_api_proposal/LICENSE.txt Fri Dec 3 05:51:22 2004
@@ -0,0 +1,204 @@
+/*
+ * Apache License
+ * Version 2.0, January 2004
+ * http://www.apache.org/licenses/
+ *
+ * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ *
+ * 1. Definitions.
+ *
+ * "License" shall mean the terms and conditions for use, reproduction,
+ * and distribution as defined by Sections 1 through 9 of this document.
+ *
+ * "Licensor" shall mean the copyright owner or entity authorized by
+ * the copyright owner that is granting the License.
+ *
+ * "Legal Entity" shall mean the union of the acting entity and all
+ * other entities that control, are controlled by, or are under common
+ * control with that entity. For the purposes of this definition,
+ * "control" means (i) the power, direct or indirect, to cause the
+ * direction or management of such entity, whether by contract or
+ * otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ * outstanding shares, or (iii) beneficial ownership of such entity.
+ *
+ * "You" (or "Your") shall mean an individual or Legal Entity
+ * exercising permissions granted by this License.
+ *
+ * "Source" form shall mean the preferred form for making modifications,
+ * including but not limited to software source code, documentation
+ * source, and configuration files.
+ *
+ * "Object" form shall mean any form resulting from mechanical
+ * transformation or translation of a Source form, including but
+ * not limited to compiled object code, generated documentation,
+ * and conversions to other media types.
+ *
+ * "Work" shall mean the work of authorship, whether in Source or
+ * Object form, made available under the License, as indicated by a
+ * copyright notice that is included in or attached to the work
+ * (an example is provided in the Appendix below).
+ *
+ * "Derivative Works" shall mean any work, whether in Source or Object
+ * form, that is based on (or derived from) the Work and for which the
+ * editorial revisions, annotations, elaborations, or other modifications
+ * represent, as a whole, an original work of authorship. For the purposes
+ * of this License, Derivative Works shall not include works that remain
+ * separable from, or merely link (or bind by name) to the interfaces of,
+ * the Work and Derivative Works thereof.
+ *
+ * "Contribution" shall mean any work of authorship, including
+ * the original version of the Work and any modifications or additions
+ * to that Work or Derivative Works thereof, that is intentionally
+ * submitted to Licensor for inclusion in the Work by the copyright owner
+ * or by an individual or Legal Entity authorized to submit on behalf of
+ * the copyright owner. For the purposes of this definition, "submitted"
+ * means any form of electronic, verbal, or written communication sent
+ * to the Licensor or its representatives, including but not limited to
+ * communication on electronic mailing lists, source code control systems,
+ * and issue tracking systems that are managed by, or on behalf of, the
+ * Licensor for the purpose of discussing and improving the Work, but
+ * excluding communication that is conspicuously marked or otherwise
+ * designated in writing by the copyright owner as "Not a Contribution."
+ *
+ * "Contributor" shall mean Licensor and any individual or Legal Entity
+ * on behalf of whom a Contribution has been received by Licensor and
+ * subsequently incorporated within the Work.
+ *
+ * 2. Grant of Copyright License. Subject to the terms and conditions of
+ * this License, each Contributor hereby grants to You a perpetual,
+ * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ * copyright license to reproduce, prepare Derivative Works of,
+ * publicly display, publicly perform, sublicense, and distribute the
+ * Work and such Derivative Works in Source or Object form.
+ *
+ * 3. Grant of Patent License. Subject to the terms and conditions of
+ * this License, each Contributor hereby grants to You a perpetual,
+ * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ * (except as stated in this section) patent license to make, have made,
+ * use, offer to sell, sell, import, and otherwise transfer the Work,
+ * where such license applies only to those patent claims licensable
+ * by such Contributor that are necessarily infringed by their
+ * Contribution(s) alone or by combination of their Contribution(s)
+ * with the Work to which such Contribution(s) was submitted. If You
+ * institute patent litigation against any entity (including a
+ * cross-claim or counterclaim in a lawsuit) alleging that the Work
+ * or a Contribution incorporated within the Work constitutes direct
+ * or contributory patent infringement, then any patent licenses
+ * granted to You under this License for that Work shall terminate
+ * as of the date such litigation is filed.
+ *
+ * 4. Redistribution. You may reproduce and distribute copies of the
+ * Work or Derivative Works thereof in any medium, with or without
+ * modifications, and in Source or Object form, provided that You
+ * meet the following conditions:
+ *
+ * (a) You must give any other recipients of the Work or
+ * Derivative Works a copy of this License; and
+ *
+ * (b) You must cause any modified files to carry prominent notices
+ * stating that You changed the files; and
+ *
+ * (c) You must retain, in the Source form of any Derivative Works
+ * that You distribute, all copyright, patent, trademark, and
+ * attribution notices from the Source form of the Work,
+ * excluding those notices that do not pertain to any part of
+ * the Derivative Works; and
+ *
+ * (d) If the Work includes a "NOTICE" text file as part of its
+ * distribution, then any Derivative Works that You distribute must
+ * include a readable copy of the attribution notices contained
+ * within such NOTICE file, excluding those notices that do not
+ * pertain to any part of the Derivative Works, in at least one
+ * of the following places: within a NOTICE text file distributed
+ * as part of the Derivative Works; within the Source form or
+ * documentation, if provided along with the Derivative Works; or,
+ * within a display generated by the Derivative Works, if and
+ * wherever such third-party notices normally appear. The contents
+ * of the NOTICE file are for informational purposes only and
+ * do not modify the License. You may add Your own attribution
+ * notices within Derivative Works that You distribute, alongside
+ * or as an addendum to the NOTICE text from the Work, provided
+ * that such additional attribution notices cannot be construed
+ * as modifying the License.
+ *
+ * You may add Your own copyright statement to Your modifications and
+ * may provide additional or different license terms and conditions
+ * for use, reproduction, or distribution of Your modifications, or
+ * for any such Derivative Works as a whole, provided Your use,
+ * reproduction, and distribution of the Work otherwise complies with
+ * the conditions stated in this License.
+ *
+ * 5. Submission of Contributions. Unless You explicitly state otherwise,
+ * any Contribution intentionally submitted for inclusion in the Work
+ * by You to the Licensor shall be under the terms and conditions of
+ * this License, without any additional terms or conditions.
+ * Notwithstanding the above, nothing herein shall supersede or modify
+ * the terms of any separate license agreement you may have executed
+ * with Licensor regarding such Contributions.
+ *
+ * 6. Trademarks. This License does not grant permission to use the trade
+ * names, trademarks, service marks, or product names of the Licensor,
+ * except as required for reasonable and customary use in describing the
+ * origin of the Work and reproducing the content of the NOTICE file.
+ *
+ * 7. Disclaimer of Warranty. Unless required by applicable law or
+ * agreed to in writing, Licensor provides the Work (and each
+ * Contributor provides its Contributions) on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied, including, without limitation, any warranties or conditions
+ * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ * PARTICULAR PURPOSE. You are solely responsible for determining the
+ * appropriateness of using or redistributing the Work and assume any
+ * risks associated with Your exercise of permissions under this License.
+ *
+ * 8. Limitation of Liability. In no event and under no legal theory,
+ * whether in tort (including negligence), contract, or otherwise,
+ * unless required by applicable law (such as deliberate and grossly
+ * negligent acts) or agreed to in writing, shall any Contributor be
+ * liable to You for damages, including any direct, indirect, special,
+ * incidental, or consequential damages of any character arising as a
+ * result of this License or out of the use or inability to use the
+ * Work (including but not limited to damages for loss of goodwill,
+ * work stoppage, computer failure or malfunction, or any and all
+ * other commercial damages or losses), even if such Contributor
+ * has been advised of the possibility of such damages.
+ *
+ * 9. Accepting Warranty or Additional Liability. While redistributing
+ * the Work or Derivative Works thereof, You may choose to offer,
+ * and charge a fee for, acceptance of support, warranty, indemnity,
+ * or other liability obligations and/or rights consistent with this
+ * License. However, in accepting such obligations, You may act only
+ * on Your own behalf and on Your sole responsibility, not on behalf
+ * of any other Contributor, and only if You agree to indemnify,
+ * defend, and hold each Contributor harmless for any liability
+ * incurred by, or claims asserted against, such Contributor by reason
+ * of your accepting any such warranty or additional liability.
+ *
+ * END OF TERMS AND CONDITIONS
+ *
+ * APPENDIX: How to apply the Apache License to your work.
+ *
+ * To apply the Apache License to your work, attach the following
+ * boilerplate notice, with the fields enclosed by brackets "[]"
+ * replaced with your own identifying information. (Don't include
+ * the brackets!) The text should be enclosed in the appropriate
+ * comment syntax for the file format. We also recommend that a
+ * file or class name and description of purpose be included on the
+ * same "printed page" as the copyright notice for easier
+ * identification within third-party archives.
+ *
+ * Copyright [yyyy] [name of copyright owner]
+ *
+ * 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.
+ *
+ */
Added: incubator/directory/seda/branches/berin_api_proposal/NOTICE.txt
Url: http://svn.apache.org/viewcvs/incubator/directory/seda/branches/berin_api_proposal/NOTICE.txt?view=auto&rev=109675
==============================================================================
--- (empty file)
+++ incubator/directory/seda/branches/berin_api_proposal/NOTICE.txt Fri Dec 3 05:51:22 2004
@@ -0,0 +1,4 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+
Added: incubator/directory/seda/branches/berin_api_proposal/src/java/org/apache/directory/seda/NetworkEvent.java
Url: http://svn.apache.org/viewcvs/incubator/directory/seda/branches/berin_api_proposal/src/java/org/apache/directory/seda/NetworkEvent.java?view=auto&rev=109675
==============================================================================
--- (empty file)
+++ incubator/directory/seda/branches/berin_api_proposal/src/java/org/apache/directory/seda/NetworkEvent.java Fri Dec 3 05:51:22 2004
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ *
+ */
+package org.apache.directory.seda;
+
+import java.net.ServerSocket;
+
+/**
+ * Created by IntelliJ IDEA. User: berin Date: Dec 2, 2004 Time: 9:44:03
+ * PM To change this template use File | Settings | File Templates.
+ */
+public class NetworkEvent
+{
+ private final ServerSocket m_socket;
+
+ public NetworkEvent(final ServerSocket socket)
+ {
+ m_socket = socket;
+ }
+
+ public ServerSocket getSocket()
+ {
+ return m_socket;
+ }
+}
Modified: incubator/directory/seda/branches/berin_api_proposal/src/java/org/apache/directory/seda/PipelineUtil.java
Url: http://svn.apache.org/viewcvs/incubator/directory/seda/branches/berin_api_proposal/src/java/org/apache/directory/seda/PipelineUtil.java?view=diff&rev=109675&p1=incubator/directory/seda/branches/berin_api_proposal/src/java/org/apache/directory/seda/PipelineUtil.java&r1=109674&p2=incubator/directory/seda/branches/berin_api_proposal/src/java/org/apache/directory/seda/PipelineUtil.java&r2=109675
==============================================================================
--- incubator/directory/seda/branches/berin_api_proposal/src/java/org/apache/directory/seda/PipelineUtil.java (original)
+++ incubator/directory/seda/branches/berin_api_proposal/src/java/org/apache/directory/seda/PipelineUtil.java Fri Dec 3 05:51:22 2004
@@ -1,5 +1,18 @@
/*
- * Copyright (c) 2004 Your Corporation. All Rights Reserved.
+ * 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.
+ *
*/
package org.apache.directory.seda;
@@ -12,5 +25,11 @@
final Stage destination )
{
destination.addSource( origin.getDefaultPipe() );
+ }
+
+ public static void connectStage( final Stage origin, final String name,
+ final Stage destination )
+ {
+ destination.addSource( origin.getNamedPipe( name ) );
}
}
Added: incubator/directory/seda/branches/berin_api_proposal/src/java/org/apache/directory/seda/ProtocolRouter.java
Url: http://svn.apache.org/viewcvs/incubator/directory/seda/branches/berin_api_proposal/src/java/org/apache/directory/seda/ProtocolRouter.java?view=auto&rev=109675
==============================================================================
--- (empty file)
+++ incubator/directory/seda/branches/berin_api_proposal/src/java/org/apache/directory/seda/ProtocolRouter.java Fri Dec 3 05:51:22 2004
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ *
+ */
+package org.apache.directory.seda;
+
+import org.d_haven.event.Pipe;
+
+/**
+ * Created by IntelliJ IDEA. User: berin Date: Dec 2, 2004 Time: 9:36:46
+ * PM To change this template use File | Settings | File Templates.
+ */
+public class ProtocolRouter extends Stage
+{
+ public void handleEvent(final Object event)
+ {
+ if ( event instanceof NetworkEvent )
+ {
+ final NetworkEvent netEvent = (NetworkEvent) event;
+ final int port = netEvent.getSocket().getLocalPort();
+
+ Pipe pipe = getNamedPipe( Integer.toString( port ) );
+
+ if (null == pipe)
+ {
+ pipe = getDefaultPipe();
+ }
+
+ while ( ! pipe.tryEnqueue( event ) )
+ {
+ Thread.yield();
+ }
+ }
+ else
+ {
+ super.handleEvent( event );
+ }
+ }
+}
Modified: incubator/directory/seda/branches/berin_api_proposal/src/java/org/apache/directory/seda/Stage.java
Url: http://svn.apache.org/viewcvs/incubator/directory/seda/branches/berin_api_proposal/src/java/org/apache/directory/seda/Stage.java?view=diff&rev=109675&p1=incubator/directory/seda/branches/berin_api_proposal/src/java/org/apache/directory/seda/Stage.java&r1=109674&p2=incubator/directory/seda/branches/berin_api_proposal/src/java/org/apache/directory/seda/Stage.java&r2=109675
==============================================================================
--- incubator/directory/seda/branches/berin_api_proposal/src/java/org/apache/directory/seda/Stage.java (original)
+++ incubator/directory/seda/branches/berin_api_proposal/src/java/org/apache/directory/seda/Stage.java Fri Dec 3 05:51:22 2004
@@ -1,5 +1,18 @@
/*
- * Copyright (c) 2004 Your Corporation. All Rights Reserved.
+ * 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.
+ *
*/
package org.apache.directory.seda;
@@ -53,19 +66,19 @@
getDefaultPipe().tryEnqueue(event);
}
- public void addSink( final String name, final Sink sink )
+ public void addPipe( final String name, final Pipe pipe )
{
if (null == name)
{
throw new IllegalArgumentException("'name' cannot be null");
}
- if (null == sink)
+ if (null == pipe)
{
- throw new IllegalArgumentException("'sink' cannot be null");
+ throw new IllegalArgumentException("'pipe' cannot be null");
}
- m_namedSinks.put( name, sink );
+ m_namedSinks.put( name, pipe );
}
public Pipe getDefaultPipe()
@@ -73,8 +86,8 @@
return m_sink;
}
- public Sink getNamedSink( final String name )
+ public Pipe getNamedPipe( final String name )
{
- return (Sink)m_namedSinks.get(name);
+ return (Pipe)m_namedSinks.get(name);
}
}
Added: incubator/directory/seda/branches/berin_api_proposal/src/test/org/apache/directory/seda/test/TestNetworkEvent.java
Url: http://svn.apache.org/viewcvs/incubator/directory/seda/branches/berin_api_proposal/src/test/org/apache/directory/seda/test/TestNetworkEvent.java?view=auto&rev=109675
==============================================================================
--- (empty file)
+++ incubator/directory/seda/branches/berin_api_proposal/src/test/org/apache/directory/seda/test/TestNetworkEvent.java Fri Dec 3 05:51:22 2004
@@ -0,0 +1,61 @@
+/*
+ * 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.
+ *
+ */
+package org.apache.directory.seda.test;
+
+import junit.framework.TestCase;
+
+import java.net.ServerSocket;
+import java.io.IOException;
+
+import org.apache.directory.seda.NetworkEvent;
+
+/**
+ * Created by IntelliJ IDEA. User: berin Date: Dec 2, 2004 Time: 9:47:26
+ * PM To change this template use File | Settings | File Templates.
+ */
+public class TestNetworkEvent extends TestCase
+{
+ private static final int PORT = 6666;
+ private ServerSocket m_socket;
+
+ public TestNetworkEvent(final String name)
+ {
+ super(name);
+ }
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+
+ m_socket = new ServerSocket(PORT);
+ }
+
+ public void tearDown() throws Exception
+ {
+ super.tearDown();
+
+ m_socket.close();
+ }
+
+ public void testCreate() throws IOException
+ {
+ final NetworkEvent event = new NetworkEvent(m_socket);
+
+ assertNotNull(event);
+ assertEquals(m_socket, event.getSocket() );
+ }
+}
Modified: incubator/directory/seda/branches/berin_api_proposal/src/test/org/apache/directory/seda/test/TestPipelineUtil.java
Url: http://svn.apache.org/viewcvs/incubator/directory/seda/branches/berin_api_proposal/src/test/org/apache/directory/seda/test/TestPipelineUtil.java?view=diff&rev=109675&p1=incubator/directory/seda/branches/berin_api_proposal/src/test/org/apache/directory/seda/test/TestPipelineUtil.java&r1=109674&p2=incubator/directory/seda/branches/berin_api_proposal/src/test/org/apache/directory/seda/test/TestPipelineUtil.java&r2=109675
==============================================================================
--- incubator/directory/seda/branches/berin_api_proposal/src/test/org/apache/directory/seda/test/TestPipelineUtil.java (original)
+++ incubator/directory/seda/branches/berin_api_proposal/src/test/org/apache/directory/seda/test/TestPipelineUtil.java Fri Dec 3 05:51:22 2004
@@ -1,5 +1,18 @@
/*
- * Copyright (c) 2004 Your Corporation. All Rights Reserved.
+ * 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.
+ *
*/
package org.apache.directory.seda.test;
@@ -7,6 +20,7 @@
import org.apache.directory.seda.PipelineUtil;
import org.apache.directory.seda.Stage;
import org.d_haven.event.Pipe;
+import org.d_haven.event.impl.DefaultPipe;
/**
* Created by IntelliJ IDEA. User: berin Date: Dec 2, 2004 Time: 4:20:02
@@ -31,5 +45,22 @@
assertEquals( 1, destination.getSources().length );
assertEquals( originPipe, destination.getSources()[0] );
+ }
+
+ public void testConnectStage_namedPipe()
+ {
+ final Stage origin = new Stage();
+ final Stage destination = new Stage();
+ final Pipe pipe = new DefaultPipe();
+ final String name = "test";
+
+ origin.addPipe( name, pipe );
+
+ assertEquals( 0, destination.getSources().length );
+
+ PipelineUtil.connectStage( origin, name, destination );
+
+ assertEquals( 1, destination.getSources().length );
+ assertEquals( pipe, destination.getSources()[0] );
}
}
Added: incubator/directory/seda/branches/berin_api_proposal/src/test/org/apache/directory/seda/test/TestProtocolRouter.java
Url: http://svn.apache.org/viewcvs/incubator/directory/seda/branches/berin_api_proposal/src/test/org/apache/directory/seda/test/TestProtocolRouter.java?view=auto&rev=109675
==============================================================================
--- (empty file)
+++ incubator/directory/seda/branches/berin_api_proposal/src/test/org/apache/directory/seda/test/TestProtocolRouter.java Fri Dec 3 05:51:22 2004
@@ -0,0 +1,146 @@
+/*
+ * 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.
+ *
+ */
+package org.apache.directory.seda.test;
+
+import junit.framework.TestCase;
+import org.apache.directory.seda.ProtocolRouter;
+import org.apache.directory.seda.NetworkEvent;
+import org.d_haven.event.impl.DefaultPipe;
+import org.d_haven.event.Pipe;
+import org.d_haven.event.command.SwitchedEnqueuePredicate;
+
+import java.net.ServerSocket;
+import java.io.IOException;
+import java.util.concurrent.CyclicBarrier;
+
+/**
+ * Created by IntelliJ IDEA. User: berin Date: Dec 2, 2004 Time: 9:35:36
+ * PM To change this template use File | Settings | File Templates.
+ */
+public class TestProtocolRouter extends TestCase
+{
+ private static final int PORT = 6666;
+ private ServerSocket m_socket;
+
+ public TestProtocolRouter(final String name)
+ {
+ super(name);
+ }
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+
+ m_socket = new ServerSocket(PORT);
+ }
+
+ public void tearDown() throws Exception
+ {
+ super.tearDown();
+
+ m_socket.close();
+ }
+
+ public void testCreateRouter()
+ {
+ final ProtocolRouter protocolRouter = new ProtocolRouter();
+ assertNotNull(protocolRouter);
+ }
+
+ public void testRouteEvents() throws IOException
+ {
+ final ProtocolRouter protocolRouter = new ProtocolRouter();
+ final Pipe port6666 = new DefaultPipe();
+
+ protocolRouter.addPipe("6666", port6666);
+
+ final NetworkEvent event6666 = new NetworkEvent(m_socket);
+
+ protocolRouter.handleEvent( event6666 );
+
+ assertEquals(0, protocolRouter.getDefaultPipe().size() );
+ assertEquals(event6666, protocolRouter.getNamedPipe( "6666" ).dequeue() );
+ }
+
+ public void testRouteEvent_notNetworkEvent()
+ {
+ final ProtocolRouter protocolRouter = new ProtocolRouter();
+ final Pipe port6666 = new DefaultPipe();
+
+ protocolRouter.addPipe("6666", port6666);
+
+ protocolRouter.handleEvent( "test" );
+
+ assertEquals(0, protocolRouter.getNamedPipe( "6666" ).size() );
+ assertEquals("test", protocolRouter.getDefaultPipe().dequeue() );
+ }
+
+ public void testRouteEvent_missingPipe()
+ {
+ final ProtocolRouter protocolRouter = new ProtocolRouter();
+ final Pipe port80 = new DefaultPipe();
+
+ protocolRouter.addPipe("80", port80);
+
+ final NetworkEvent event6666 = new NetworkEvent(m_socket);
+
+ protocolRouter.handleEvent( event6666 );
+
+ assertEquals(0, protocolRouter.getNamedPipe( "80" ).size() );
+ assertEquals(event6666, protocolRouter.getDefaultPipe().dequeue() );
+ }
+
+ public void testRouteEvent_backPressure()
+ throws Exception
+ {
+ final ProtocolRouter protocolRouter = new ProtocolRouter();
+ final Pipe port6666 = new DefaultPipe();
+ final SwitchedEnqueuePredicate predicate = new SwitchedEnqueuePredicate();
+ port6666.setTimeout( -1 );
+ port6666.setEnqueuePredicate( predicate );
+ predicate.block();
+
+ protocolRouter.addPipe("6666", port6666);
+
+ final NetworkEvent event6666 = new NetworkEvent(m_socket);
+ final CyclicBarrier barrier = new CyclicBarrier(2);
+
+ final Thread runner = new Thread(new Runnable() {
+ public void run()
+ {
+ protocolRouter.handleEvent( event6666 );
+ try
+ {
+ barrier.await();
+ }
+ catch ( Exception e )
+ {
+ }
+ }
+ });
+ runner.start();
+
+ assertEquals(0, protocolRouter.getDefaultPipe().size() );
+ assertEquals(0, protocolRouter.getNamedPipe( "6666" ).size() );
+
+ predicate.accept();
+ barrier.await();
+
+ assertEquals(0, protocolRouter.getDefaultPipe().size() );
+ assertEquals(event6666, protocolRouter.getNamedPipe( "6666" ).dequeue() );
+ }
+}
Modified: incubator/directory/seda/branches/berin_api_proposal/src/test/org/apache/directory/seda/test/TestStage.java
Url: http://svn.apache.org/viewcvs/incubator/directory/seda/branches/berin_api_proposal/src/test/org/apache/directory/seda/test/TestStage.java?view=diff&rev=109675&p1=incubator/directory/seda/branches/berin_api_proposal/src/test/org/apache/directory/seda/test/TestStage.java&r1=109674&p2=incubator/directory/seda/branches/berin_api_proposal/src/test/org/apache/directory/seda/test/TestStage.java&r2=109675
==============================================================================
--- incubator/directory/seda/branches/berin_api_proposal/src/test/org/apache/directory/seda/test/TestStage.java (original)
+++ incubator/directory/seda/branches/berin_api_proposal/src/test/org/apache/directory/seda/test/TestStage.java Fri Dec 3 05:51:22 2004
@@ -1,5 +1,18 @@
/*
- * Copyright (c) 2004 Your Corporation. All Rights Reserved.
+ * 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.
+ *
*/
package org.apache.directory.seda.test;
@@ -40,25 +53,25 @@
assertEquals( input, stage.getSources()[0] );
}
- public void testAddSink()
+ public void testAddPipe()
{
final Stage stage = new Stage();
final String name = "test";
final Pipe output = new DefaultPipe();
- stage.addSink(name, output);
- assertNull( stage.getNamedSink( null ) );
- assertEquals( output, stage.getNamedSink(name) );
+ stage.addPipe(name, output);
+ assertNull( stage.getNamedPipe( null ) );
+ assertEquals( output, stage.getNamedPipe(name) );
}
- public void testAddSink_nullName()
+ public void testAddPipe_nullName()
{
final Stage stage = new Stage();
final Pipe output = new DefaultPipe();
try
{
- stage.addSink(null, output);
+ stage.addPipe(null, output);
fail("Did not throw expected exception.");
}
catch(Exception e)
@@ -67,14 +80,14 @@
}
}
- public void testAddSink_nullSink()
+ public void testAddPipe_nullSink()
{
final Stage stage = new Stage();
final String name = "test";
try
{
- stage.addSink(name, null);
+ stage.addPipe(name, null);
fail("Did not throw expected exception.");
}
catch(Exception e)