Thanks, Jacek!
On Nov 21, 2006, at 2:16 AM, [EMAIL PROTECTED] wrote:
Author: jlaskowski
Date: Tue Nov 21 02:16:17 2006
New Revision: 477601
URL: http://svn.apache.org/viewvc?view=rev&rev=477601
Log:
Administrativa
* propset svn:keywords
* propset svn:ignore
* added javadoc (where I thought I might get the point)
* added $Rev$ $Date$
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/
main/java/org/apache/openejb/spi/Service.java
incubator/openejb/trunk/openejb3/server/openejb-derbynet/
(props changed)
incubator/openejb/trunk/openejb3/server/openejb-derbynet/
LICENSE (props changed)
incubator/openejb/trunk/openejb3/server/openejb-derbynet/
NOTICE (props changed)
incubator/openejb/trunk/openejb3/server/openejb-derbynet/
pom.xml (contents, props changed)
incubator/openejb/trunk/openejb3/server/openejb-derbynet/src/
main/java/org/apache/openejb/server/derbynet/
DerbyNetworkService.java (props changed)
incubator/openejb/trunk/openejb3/server/openejb-derbynet/src/
main/resources/META-INF/org.apache.openejb.server.ServerService/
derbynet (props changed)
incubator/openejb/trunk/openejb3/server/openejb-server/src/main/
java/org/apache/openejb/server/SelfManaging.java
incubator/openejb/trunk/openejb3/server/openejb-server/src/main/
java/org/apache/openejb/server/ServerService.java
incubator/openejb/trunk/openejb3/server/openejb-server/src/main/
java/org/apache/openejb/server/ServiceManager.java
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/
src/main/java/org/apache/openejb/spi/Service.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/
container/openejb-core/src/main/java/org/apache/openejb/spi/
Service.java?view=diff&rev=477601&r1=477600&r2=477601
======================================================================
========
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/
main/java/org/apache/openejb/spi/Service.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/
main/java/org/apache/openejb/spi/Service.java Tue Nov 21 02:16:17 2006
@@ -16,7 +16,12 @@
*/
package org.apache.openejb.spi;
+import java.util.Properties;
+
+/**
+ * @version $Rev$ $Date$
+ */
public interface Service {
- public void init(java.util.Properties props) throws Exception;
+ public void init(Properties props) throws Exception;
}
Propchange: incubator/openejb/trunk/openejb3/server/openejb-derbynet/
----------------------------------------------------------------------
--------
--- svn:ignore (added)
+++ svn:ignore Tue Nov 21 02:16:17 2006
@@ -0,0 +1,8 @@
+*.ipr
+*.iml
+*.iws
+*~
+.project
+.classpath
+target
+
Propchange: incubator/openejb/trunk/openejb3/server/openejb-
derbynet/LICENSE
----------------------------------------------------------------------
--------
svn:keywords = Date Rev Author Id Revision HeadURL
Propchange: incubator/openejb/trunk/openejb3/server/openejb-
derbynet/NOTICE
----------------------------------------------------------------------
--------
svn:keywords = Date Rev Author Id Revision HeadURL
Modified: incubator/openejb/trunk/openejb3/server/openejb-derbynet/
pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/
server/openejb-derbynet/pom.xml?
view=diff&rev=477601&r1=477600&r2=477601
======================================================================
========
--- incubator/openejb/trunk/openejb3/server/openejb-derbynet/
pom.xml (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-derbynet/
pom.xml Tue Nov 21 02:16:17 2006
@@ -1,3 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+
+<!-- $Rev$ $Date$ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://
maven.apache.org/maven-v4_0_0.xsd">
<parent>
Propchange: incubator/openejb/trunk/openejb3/server/openejb-
derbynet/pom.xml
----------------------------------------------------------------------
--------
svn:keywords = Date Rev Author Id Revision HeadURL
Propchange: incubator/openejb/trunk/openejb3/server/openejb-
derbynet/src/main/java/org/apache/openejb/server/derbynet/
DerbyNetworkService.java
----------------------------------------------------------------------
--------
svn:keywords = Date Rev Author Id Revision HeadURL
Propchange: incubator/openejb/trunk/openejb3/server/openejb-
derbynet/src/main/resources/META-INF/
org.apache.openejb.server.ServerService/derbynet
----------------------------------------------------------------------
--------
svn:keywords = Date Rev Author Id Revision HeadURL
Modified: incubator/openejb/trunk/openejb3/server/openejb-server/
src/main/java/org/apache/openejb/server/SelfManaging.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/
server/openejb-server/src/main/java/org/apache/openejb/server/
SelfManaging.java?view=diff&rev=477601&r1=477600&r2=477601
======================================================================
========
--- incubator/openejb/trunk/openejb3/server/openejb-server/src/main/
java/org/apache/openejb/server/SelfManaging.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-server/src/main/
java/org/apache/openejb/server/SelfManaging.java Tue Nov 21
02:16:17 2006
@@ -17,6 +17,12 @@
package org.apache.openejb.server;
/**
+ * Marker interface to announce that a service class (i.e.
instance of
+ * [EMAIL PROTECTED] ServerService}) should not be wrapped by other services
(that
+ * eventually create a chain of services around the main service
to be wrapped)
+ *
+ * @see ServiceManager#init()
+ *
* @version $Rev$ $Date$
*/
public interface SelfManaging {}
Modified: incubator/openejb/trunk/openejb3/server/openejb-server/
src/main/java/org/apache/openejb/server/ServerService.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/
server/openejb-server/src/main/java/org/apache/openejb/server/
ServerService.java?view=diff&rev=477601&r1=477600&r2=477601
======================================================================
========
--- incubator/openejb/trunk/openejb3/server/openejb-server/src/main/
java/org/apache/openejb/server/ServerService.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-server/src/main/
java/org/apache/openejb/server/ServerService.java Tue Nov 21
02:16:17 2006
@@ -16,15 +16,17 @@
*/
package org.apache.openejb.server;
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
import org.apache.openejb.spi.Service;
+/**
+ * @version $Rev$ $Date$
+ */
public interface ServerService extends Service {
-
- public void init(Properties props) throws Exception;
public void start() throws ServiceException;
Modified: incubator/openejb/trunk/openejb3/server/openejb-server/
src/main/java/org/apache/openejb/server/ServiceManager.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/
server/openejb-server/src/main/java/org/apache/openejb/server/
ServiceManager.java?view=diff&rev=477601&r1=477600&r2=477601
======================================================================
========
--- incubator/openejb/trunk/openejb3/server/openejb-server/src/main/
java/org/apache/openejb/server/ServiceManager.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-server/src/main/
java/org/apache/openejb/server/ServiceManager.java Tue Nov 21
02:16:17 2006
@@ -158,13 +158,11 @@
}
if (!(service instanceof SelfManaging)) {
- // Wrap Service
service = new ServiceLogger(service);
service = new ServiceAccessController(service);
service = new ServiceDaemon(service);
}
- // Initialize it
service.init(serviceProperties);
enabledServers.add(service);
}