dirkv       2004/03/21 13:10:49

  Modified:    scaffold/src/java/org/apache/commons/scaffold/http
                        HttpClient.java SetUp.java SocketUtil.java
  Log:
  Bugzilla Bug 27689: [scaffold] changing to the Apache 2.0 license removed source 
file contents.
  
  Revision  Changes    Path
  1.3       +18 -2     
jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/http/HttpClient.java
  
  Index: HttpClient.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/http/HttpClient.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- HttpClient.java   23 Nov 2002 02:45:55 -0000      1.2
  +++ HttpClient.java   21 Mar 2004 21:10:49 -0000      1.3
  @@ -1,3 +1,19 @@
  +/*
  + * Copyright 2000-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.commons.scaffold.http;
   
   import java.net.*;
  
  
  
  1.6       +66 -9     
jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/http/SetUp.java
  
  Index: SetUp.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/http/SetUp.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SetUp.java        28 Feb 2004 03:35:44 -0000      1.5
  +++ SetUp.java        21 Mar 2004 21:10:49 -0000      1.6
  @@ -1,12 +1,3 @@
  -package org.apache.commons.scaffold.http;
  -
  -
  -import java.io.IOException;
  -import java.util.Properties;
  -import javax.servlet.ServletException;
  -
  -import org.apache.commons.scaffold.http.ConnectionServlet;
  -
   /*
    * Copyright 1999,2004 The Apache Software Foundation.
    * 
  @@ -23,4 +14,70 @@
    * limitations under the License.
    */
   
  +package org.apache.commons.scaffold.http;
  +
  +
  +import java.io.IOException;
  +import java.util.Properties;
  +import javax.servlet.ServletException;
  +
  +import org.apache.commons.scaffold.http.ConnectionServlet;
  +
  +/**
  + * Load a connection adaptor and initialize default command store
  + * for use with StorageBeans.
  + * <p>
  + * This servlet can be configured using the following init-params:
  + * <p>
  + * <b>command_path</b> Path to SQL commands (Properties file).
  + * <p>
  + * <b>NOTE:</b> Unlike the path to the Struts application resources file,
  + * the paths for this servlet should use a slash and includes the
  + * properties extension.
  + * <p>
  + * The runtime processing of requests is handled by the Struts controller.
  + * This servlet is just to handle our own custom bits.
  + */
  +public class SetUp extends ConnectionServlet {
  +
  +
  +// --------------------------------------------------------------- keys
  +
  +    /**
  +     * Parameter to specify a new path for commands used by the
  +     * application [command_path].
  +     */
  +    public static String COMMAND_PARAMETER = "command_path";
  +
  +
  +    /**
  +     * Default path for commands used by application
  +     * ["resources/command.properties"].
  +     */
  +    public static String COMMAND_PATH =
  +        "resources/command.properties";
  +
  +
  +
  +// --------------------------------------------------------- initCustom
  +
  +    /**
  +     * Initialize the SQL properties for the Artimus application.
  +     *
  +     * Loads the commands for the keys and articles packages.
  +     *
  +     * @exception IOException if an input/output error is encountered
  +     * @exception ServletException if we cannot initialize these resources
  +     */
  +    protected void initCustom() throws IOException, ServletException {
  +
  +            // Initialize sql package
  +        Properties commands =
  +            loadProperties(COMMAND_PARAMETER,COMMAND_PATH,null);
  +
  +        org.apache.commons.scaffold.sql.StorageBeanBase.init(commands);
  +
  +    }
  +
  +} // end SetUp
   
  
  
  
  1.2       +16 -2     
jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/http/SocketUtil.java
  
  Index: SocketUtil.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/http/SocketUtil.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SocketUtil.java   14 Aug 2002 17:50:28 -0000      1.1
  +++ SocketUtil.java   21 Mar 2004 21:10:49 -0000      1.2
  @@ -1,9 +1,23 @@
  +/*
  + * Copyright 2000-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.commons.scaffold.http;
   
  -
   import java.net.*;
   import java.io.*;
  -
   
   /** A shorthand way to create BufferedReaders and
    *  PrintWriters associated with a Socket.
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to