You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2012/03/23 07:19:27 UTC
svn commit: r1304199 [2/2] - in /openejb/branches/openejb-3.1.x/server:
openejb-client/ openejb-client/src/main/java/org/apache/openejb/client/
openejb-client/src/main/java/org/apache/openejb/client/event/
openejb-client/src/main/resources/ openejb-cli...
Added: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ConnectionStrategyAdded.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ConnectionStrategyAdded.java?rev=1304199&view=auto
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ConnectionStrategyAdded.java (added)
+++ openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ConnectionStrategyAdded.java Fri Mar 23 06:19:26 2012
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.openejb.client.event;
+
+import org.apache.openejb.client.ConnectionStrategy;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@Log(Log.Level.CONFIG)
+public class ConnectionStrategyAdded {
+
+ private String scheme;
+ private ConnectionStrategy strategy;
+
+ public ConnectionStrategyAdded(String scheme, ConnectionStrategy strategy) {
+ this.scheme = scheme;
+ this.strategy = strategy;
+ }
+
+ public String getScheme() {
+ return scheme;
+ }
+
+ public void setScheme(String scheme) {
+ this.scheme = scheme;
+ }
+
+ public ConnectionStrategy getStrategy() {
+ return strategy;
+ }
+
+ public void setStrategy(ConnectionStrategy strategy) {
+ this.strategy = strategy;
+ }
+
+ @Override
+ public String toString() {
+ return "ConnectionStrategyAdded{" +
+ "scheme='" + scheme + '\'' +
+ ", strategy=" + strategy.getClass().getName() +
+ '}';
+ }
+}
Added: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ConnectionStrategyFailed.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ConnectionStrategyFailed.java?rev=1304199&view=auto
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ConnectionStrategyFailed.java (added)
+++ openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ConnectionStrategyFailed.java Fri Mar 23 06:19:26 2012
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.openejb.client.event;
+
+import org.apache.openejb.client.ClusterMetaData;
+import org.apache.openejb.client.ConnectionStrategy;
+import org.apache.openejb.client.ServerMetaData;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@Log(Log.Level.SEVERE)
+public class ConnectionStrategyFailed {
+
+ private ConnectionStrategy strategy;
+ private ClusterMetaData cluster;
+ private ServerMetaData server;
+ private Throwable cause;
+
+ public ConnectionStrategyFailed(ConnectionStrategy strategy, ClusterMetaData cluster, ServerMetaData server, Throwable cause) {
+ this.strategy = strategy;
+ this.cluster = cluster;
+ this.server = server;
+ this.cause = cause;
+ }
+
+ public ConnectionStrategy getStrategy() {
+ return strategy;
+ }
+
+ public ClusterMetaData getCluster() {
+ return cluster;
+ }
+
+ public ServerMetaData getServer() {
+ return server;
+ }
+
+ public Throwable getCause() {
+ return cause;
+ }
+
+ @Override
+ public String toString() {
+ return "ConnectionStrategyFailed{" +
+ "strategy=" + strategy.getClass().getSimpleName() +
+ ", cluster=" + cluster +
+ ", server=" + server.getLocation() +
+ '}';
+ }
+}
Added: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ConnectionStrategyRemoved.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ConnectionStrategyRemoved.java?rev=1304199&view=auto
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ConnectionStrategyRemoved.java (added)
+++ openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ConnectionStrategyRemoved.java Fri Mar 23 06:19:26 2012
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.openejb.client.event;
+
+import org.apache.openejb.client.ConnectionStrategy;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@Log(Log.Level.CONFIG)
+public class ConnectionStrategyRemoved {
+
+ private String scheme;
+ private ConnectionStrategy strategy;
+
+ public ConnectionStrategyRemoved(String scheme, ConnectionStrategy strategy) {
+ this.scheme = scheme;
+ this.strategy = strategy;
+ }
+
+ public String getScheme() {
+ return scheme;
+ }
+
+ public void setScheme(String scheme) {
+ this.scheme = scheme;
+ }
+
+ public ConnectionStrategy getStrategy() {
+ return strategy;
+ }
+
+ public void setStrategy(ConnectionStrategy strategy) {
+ this.strategy = strategy;
+ }
+
+ @Override
+ public String toString() {
+ return "ConnectionStrategyRemoved{" +
+ "scheme='" + scheme + '\'' +
+ ", strategy=" + strategy.getClass().getName() +
+ '}';
+ }
+}
Added: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/FailoverSelection.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/FailoverSelection.java?rev=1304199&view=auto
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/FailoverSelection.java (added)
+++ openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/FailoverSelection.java Fri Mar 23 06:19:26 2012
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.openejb.client.event;
+
+import java.net.URI;
+import java.util.Set;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class FailoverSelection {
+ protected final Set<URI> remaining;
+ protected final Set<URI> failed;
+ protected final URI server;
+
+ public FailoverSelection(Set<URI> remaining, Set<URI> failed, URI server) {
+ this.remaining = remaining;
+ this.server = server;
+ this.failed = failed;
+ }
+
+ public Set<URI> getRemaining() {
+ return remaining;
+ }
+
+ public Set<URI> getFailed() {
+ return failed;
+ }
+
+ public URI getServer() {
+ return server;
+ }
+
+ @Override
+ public String toString() {
+ return this.getClass().getSimpleName() + "{" +
+ "remaining=" + remaining.size() +
+ ", failed=" + failed.size() +
+ ", server=" + server +
+ '}';
+ }
+}
Added: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/Log.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/Log.java?rev=1304199&view=auto
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/Log.java (added)
+++ openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/Log.java Fri Mar 23 06:19:26 2012
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.openejb.client.event;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@Target(TYPE)
+@Retention(RUNTIME)
+@Documented
+public @interface Log {
+ Level value() default Level.INFO;
+
+ public static enum Level {
+ SEVERE,
+ WARNING,
+ INFO,
+ CONFIG,
+ FINE,
+ FINER,
+ FINEST
+ }
+}
\ No newline at end of file
Added: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ObserverAdded.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ObserverAdded.java?rev=1304199&view=auto
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ObserverAdded.java (added)
+++ openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ObserverAdded.java Fri Mar 23 06:19:26 2012
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.openejb.client.event;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@Log(Log.Level.CONFIG)
+public class ObserverAdded {
+
+ private final Object observer;
+
+ public ObserverAdded(Object observer) {
+ this.observer = observer;
+ }
+
+ public Object getObserver() {
+ return observer;
+ }
+
+ @Override
+ public String toString() {
+ return "ObserverAdded{" +
+ "observer=" + observer.getClass().getName() +
+ '}';
+ }
+}
Added: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ObserverRemoved.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ObserverRemoved.java?rev=1304199&view=auto
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ObserverRemoved.java (added)
+++ openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ObserverRemoved.java Fri Mar 23 06:19:26 2012
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.openejb.client.event;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@Log(Log.Level.CONFIG)
+public class ObserverRemoved {
+
+ private final Object observer;
+
+ public ObserverRemoved(Object observer) {
+ this.observer = observer;
+ }
+
+ public Object getObserver() {
+ return observer;
+ }
+
+ @Override
+ public String toString() {
+ return "ObserverRemoved{" +
+ "observer=" + observer.getClass().getName() +
+ '}';
+ }
+}
Added: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/Observes.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/Observes.java?rev=1304199&view=auto
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/Observes.java (added)
+++ openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/Observes.java Fri Mar 23 06:19:26 2012
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.openejb.client.event;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@Target(PARAMETER)
+@Retention(RUNTIME)
+@Documented
+public @interface Observes {
+}
\ No newline at end of file
Added: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RandomFailoverSelection.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RandomFailoverSelection.java?rev=1304199&view=auto
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RandomFailoverSelection.java (added)
+++ openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RandomFailoverSelection.java Fri Mar 23 06:19:26 2012
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.openejb.client.event;
+
+import java.net.URI;
+import java.util.Set;
+
+/**
+* @version $Rev$ $Date$
+*/
+@Log(Log.Level.WARNING)
+public class RandomFailoverSelection extends FailoverSelection {
+
+public RandomFailoverSelection(Set<URI> remaining, Set<URI> failed, URI server) {
+ super(remaining, failed, server);
+}
+}
Added: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RemoteInitialContextCreated.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RemoteInitialContextCreated.java?rev=1304199&view=auto
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RemoteInitialContextCreated.java (added)
+++ openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RemoteInitialContextCreated.java Fri Mar 23 06:19:26 2012
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.openejb.client.event;
+
+import java.net.URI;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@Log
+public class RemoteInitialContextCreated {
+
+ private final URI providerUri;
+
+ public RemoteInitialContextCreated(URI providerUri) {
+ this.providerUri = providerUri;
+ }
+
+ public URI getProviderUri() {
+ return providerUri;
+ }
+
+ @Override
+ public String toString() {
+ return "RemoteInitialContextCreated{" +
+ "providerUri=" + providerUri +
+ '}';
+ }
+}
Added: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RequestFailed.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RequestFailed.java?rev=1304199&view=auto
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RequestFailed.java (added)
+++ openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RequestFailed.java Fri Mar 23 06:19:26 2012
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.openejb.client.event;
+
+import org.apache.openejb.client.Request;
+
+import java.net.URI;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@Log(Log.Level.SEVERE)
+public class RequestFailed {
+
+ private final URI server;
+
+ private final Request request;
+
+ public RequestFailed(URI server, Request request) {
+ this.server = server;
+ this.request = request;
+ }
+
+
+ public URI getServer() {
+ return server;
+ }
+
+ public Request getRequest() {
+ return request;
+ }
+
+ @Override
+ public String toString() {
+ return "RequestFailed{" +
+ "server=" + server +
+ "} " + request;
+ }
+}
Added: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RetryConditionAdded.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RetryConditionAdded.java?rev=1304199&view=auto
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RetryConditionAdded.java (added)
+++ openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RetryConditionAdded.java Fri Mar 23 06:19:26 2012
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.openejb.client.event;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@Log(Log.Level.CONFIG)
+public class RetryConditionAdded {
+
+ private final Class<? extends Throwable> condition;
+
+ public RetryConditionAdded(Class<? extends Throwable> condition) {
+ this.condition = condition;
+ }
+
+ public Class<? extends Throwable> getCondition() {
+ return condition;
+ }
+
+ @Override
+ public String toString() {
+ return "RetryConditionAdded{" +
+ "condition=" + condition.getName() +
+ '}';
+ }
+}
Added: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RetryConditionRemoved.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RetryConditionRemoved.java?rev=1304199&view=auto
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RetryConditionRemoved.java (added)
+++ openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RetryConditionRemoved.java Fri Mar 23 06:19:26 2012
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.openejb.client.event;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@Log(Log.Level.CONFIG)
+public class RetryConditionRemoved {
+
+ private final Class<? extends Throwable> condition;
+
+ public RetryConditionRemoved(Class<? extends Throwable> condition) {
+ this.condition = condition;
+ }
+
+ public Class<? extends Throwable> getCondition() {
+ return condition;
+ }
+
+ @Override
+ public String toString() {
+ return "RetryConditionRemoved{" +
+ "condition=" + condition.getName() +
+ '}';
+ }
+}
Added: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RetryingRequest.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RetryingRequest.java?rev=1304199&view=auto
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RetryingRequest.java (added)
+++ openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RetryingRequest.java Fri Mar 23 06:19:26 2012
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.openejb.client.event;
+
+import org.apache.openejb.client.Request;
+import org.apache.openejb.client.ServerMetaData;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@Log
+public class RetryingRequest {
+
+ private final Request request;
+ private final ServerMetaData serverMetaData;
+
+ public RetryingRequest(Request request, ServerMetaData serverMetaData) {
+ this.request = request;
+ this.serverMetaData = serverMetaData;
+ }
+
+ public Request getRequest() {
+ return request;
+ }
+
+ public ServerMetaData getServerMetaData() {
+ return serverMetaData;
+ }
+
+ @Override
+ public String toString() {
+ return "RetryingRequest{" +
+ "server=" + serverMetaData.getLocation() +
+ "} " + request;
+ }
+}
Added: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RoundRobinFailoverSelection.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RoundRobinFailoverSelection.java?rev=1304199&view=auto
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RoundRobinFailoverSelection.java (added)
+++ openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/RoundRobinFailoverSelection.java Fri Mar 23 06:19:26 2012
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.openejb.client.event;
+
+import java.net.URI;
+import java.util.Set;
+
+/**
+* @version $Rev$ $Date$
+*/
+@Log(Log.Level.WARNING)
+public class RoundRobinFailoverSelection extends FailoverSelection {
+
+public RoundRobinFailoverSelection(Set<URI> remaining, Set<URI> failed, URI server) {
+ super(remaining, failed, server);
+}
+
+}
Added: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ServerAdded.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ServerAdded.java?rev=1304199&view=auto
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ServerAdded.java (added)
+++ openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ServerAdded.java Fri Mar 23 06:19:26 2012
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.openejb.client.event;
+
+import java.net.URI;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@Log
+public class ServerAdded {
+
+ private final ClusterMetaDataUpdated clusterMetaDataUpdated;
+ private final URI server;
+
+ public ServerAdded(ClusterMetaDataUpdated clusterMetaDataUpdated, URI server) {
+ this.clusterMetaDataUpdated = clusterMetaDataUpdated;
+ this.server = server;
+ }
+
+ @Override
+ public String toString() {
+ return "ServerAdded{" +
+ "server=" + server +
+ "} " + clusterMetaDataUpdated;
+ }
+}
Added: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ServerRemoved.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ServerRemoved.java?rev=1304199&view=auto
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ServerRemoved.java (added)
+++ openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/ServerRemoved.java Fri Mar 23 06:19:26 2012
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.openejb.client.event;
+
+import java.net.URI;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@Log
+public class ServerRemoved {
+
+ private final ClusterMetaDataUpdated clusterMetaDataUpdated;
+ private final URI server;
+
+ public ServerRemoved(ClusterMetaDataUpdated clusterMetaDataUpdated, URI server) {
+ this.clusterMetaDataUpdated = clusterMetaDataUpdated;
+ this.server = server;
+ }
+
+ @Override
+ public String toString() {
+ return "ServerRemoved{" +
+ "server=" + server +
+ "} " + clusterMetaDataUpdated;
+ }
+}
Added: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/StickyFailoverSelection.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/StickyFailoverSelection.java?rev=1304199&view=auto
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/StickyFailoverSelection.java (added)
+++ openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/event/StickyFailoverSelection.java Fri Mar 23 06:19:26 2012
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.openejb.client.event;
+
+import java.net.URI;
+import java.util.Set;
+
+/**
+* @version $Rev$ $Date$
+*/
+@Log(Log.Level.WARNING)
+public class StickyFailoverSelection extends FailoverSelection {
+
+public StickyFailoverSelection(Set<URI> remaining, Set<URI> failed, URI server) {
+ super(remaining, failed, server);
+}
+}
Added: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/resources/openejb-client-version.properties
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/src/main/resources/openejb-client-version.properties?rev=1304199&view=auto
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-client/src/main/resources/openejb-client-version.properties (added)
+++ openejb/branches/openejb-3.1.x/server/openejb-client/src/main/resources/openejb-client-version.properties Fri Mar 23 06:19:26 2012
@@ -0,0 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+#
+copyright=Copyright 1999-2012 (C) Apache OpenEJB Project, All Rights Reserved.
+url=http://openejb.apache.org/
+version=${pom.version}
+date=@DATE-REPLACED-BY-MAVEN@
+time=@TIME-REPLACED-BY-MAVEN@
Modified: openejb/branches/openejb-3.1.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FullPoolFailoverTest.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FullPoolFailoverTest.java?rev=1304199&r1=1304198&r2=1304199&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FullPoolFailoverTest.java (original)
+++ openejb/branches/openejb-3.1.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FullPoolFailoverTest.java Fri Mar 23 06:19:26 2012
@@ -89,7 +89,7 @@ public class FullPoolFailoverTest extend
}
// Wait for the beans to reach the start line
- assertTrue("expected 10 invocations", paused.await(3000, TimeUnit.MILLISECONDS));
+ assertTrue("expected 10 invocations: got " + paused.getCount(), paused.await(30, TimeUnit.SECONDS));
assertEquals(10, CounterBean.instances.get());
assertEquals(10, hits.size());
@@ -159,7 +159,7 @@ public class FullPoolFailoverTest extend
}
// Wait for the beans to reach the start line
- assertTrue("expected 10 invocations", paused.await(3000, TimeUnit.MILLISECONDS));
+ assertTrue("expected 10 invocations: got " + paused.getCount(), paused.await(30, TimeUnit.SECONDS));
assertEquals(10, CounterBean.instances.get());
assertEquals(10, hits.size());
@@ -184,7 +184,7 @@ public class FullPoolFailoverTest extend
}
// Wait for the beans to reach the start line
- assertTrue("expected 20 invocations", paused.await(3000, TimeUnit.MILLISECONDS));
+ assertTrue("expected 20 invocations: got "+paused.getCount(), paused.await(30, TimeUnit.SECONDS));
// The extra 10 invocations should all have been on the "blue" server
assertEquals(expected, hits);