You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by js...@apache.org on 2006/05/27 09:56:55 UTC

svn commit: r409817 [4/8] - in /geronimo/branches/1.1: applications/console-core/src/java/org/apache/geronimo/console/util/ applications/console-framework/src/java/org/apache/geronimo/console/servlet/ applications/console-standard/ applications/console...

Modified: geronimo/branches/1.1/modules/client-builder/src/schema/geronimo-application-client-1.1.xsd
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/client-builder/src/schema/geronimo-application-client-1.1.xsd?rev=409817&r1=409816&r2=409817&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/client-builder/src/schema/geronimo-application-client-1.1.xsd (original)
+++ geronimo/branches/1.1/modules/client-builder/src/schema/geronimo-application-client-1.1.xsd Sat May 27 00:56:38 2006
@@ -15,7 +15,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<!-- @version $Rev: 356022 $ $Date: 2005-12-11 12:58:34 -0800 (Sun, 11 Dec 2005) $ -->
+<!-- @version $Rev$ $Date$ -->
 <xs:schema
     xmlns:geronimo="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1"
     targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1"

Propchange: geronimo/branches/1.1/modules/client-builder/src/schema/geronimo-application-client-1.1.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/client-builder/src/schema/geronimo-application-client-1.1.xsd
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/client-builder/src/schema/geronimo-application-client-1.1.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/propertyeditor/AbstractNameEditor.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/propertyeditor/AbstractNameEditor.java?rev=409817&r1=409816&r2=409817&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/propertyeditor/AbstractNameEditor.java (original)
+++ geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/propertyeditor/AbstractNameEditor.java Sat May 27 00:56:38 2006
@@ -25,7 +25,7 @@
 /**
  *
  *
- * @version $Rev: 356022 $ $Date: 2005-12-11 12:58:34 -0800 (Sun, 11 Dec 2005) $
+ * @version $Rev$ $Date$
  *
  * */
 public class AbstractNameEditor extends TextPropertyEditorSupport {

Propchange: geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/propertyeditor/AbstractNameEditor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/propertyeditor/AbstractNameEditor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/propertyeditor/AbstractNameEditor.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/propertyeditor/AbstractNameQueryEditor.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/propertyeditor/AbstractNameQueryEditor.java?rev=409817&r1=409816&r2=409817&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/propertyeditor/AbstractNameQueryEditor.java (original)
+++ geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/propertyeditor/AbstractNameQueryEditor.java Sat May 27 00:56:38 2006
@@ -25,7 +25,7 @@
 /**
  *
  *
- * @version $Rev: 356022 $ $Date: 2005-12-11 12:58:34 -0800 (Sun, 11 Dec 2005) $
+ * @version $Rev$ $Date$
  *
  * */
 public class AbstractNameQueryEditor extends TextPropertyEditorSupport {

Propchange: geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/propertyeditor/AbstractNameQueryEditor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/propertyeditor/AbstractNameQueryEditor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/propertyeditor/AbstractNameQueryEditor.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.1/modules/common/src/test/org/apache/geronimo/common/propertyeditor/AbstractMapEditorTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/common/src/test/org/apache/geronimo/common/propertyeditor/AbstractMapEditorTest.java?rev=409817&r1=409816&r2=409817&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/common/src/test/org/apache/geronimo/common/propertyeditor/AbstractMapEditorTest.java (original)
+++ geronimo/branches/1.1/modules/common/src/test/org/apache/geronimo/common/propertyeditor/AbstractMapEditorTest.java Sat May 27 00:56:38 2006
@@ -25,7 +25,7 @@
  * Abstract superclass for map editor tests.  Implement the two abstract methods and initialize
  * editor in the setUp() method.
  *
- * @version $Rev: 356022 $ $Date: 2005-12-11 15:58:34 -0500 (Sun, 11 Dec 2005) $
+ * @version $Rev$ $Date$
  */
 public abstract class AbstractMapEditorTest extends TestCase {
     PropertyEditor editor;

Propchange: geronimo/branches/1.1/modules/common/src/test/org/apache/geronimo/common/propertyeditor/AbstractMapEditorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/common/src/test/org/apache/geronimo/common/propertyeditor/AbstractMapEditorTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/common/src/test/org/apache/geronimo/common/propertyeditor/AbstractMapEditorTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.1/modules/common/src/test/org/apache/geronimo/common/propertyeditor/PropertiesEditorTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/common/src/test/org/apache/geronimo/common/propertyeditor/PropertiesEditorTest.java?rev=409817&r1=409816&r2=409817&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/common/src/test/org/apache/geronimo/common/propertyeditor/PropertiesEditorTest.java (original)
+++ geronimo/branches/1.1/modules/common/src/test/org/apache/geronimo/common/propertyeditor/PropertiesEditorTest.java Sat May 27 00:56:38 2006
@@ -23,7 +23,7 @@
 /**
  * Unit test for {@link PropertiesEditor} class.
  *
- * @version $Rev: 356022 $ $Date: 2005-12-11 15:58:34 -0500 (Sun, 11 Dec 2005) $
+ * @version $Rev$ $Date$
  */
 public class PropertiesEditorTest extends AbstractMapEditorTest {
 

Propchange: geronimo/branches/1.1/modules/common/src/test/org/apache/geronimo/common/propertyeditor/PropertiesEditorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/common/src/test/org/apache/geronimo/common/propertyeditor/PropertiesEditorTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/common/src/test/org/apache/geronimo/common/propertyeditor/PropertiesEditorTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/jsr88/AdminObjectDCB.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/jsr88/AdminObjectDCB.java?rev=409817&r1=409816&r2=409817&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/jsr88/AdminObjectDCB.java (original)
+++ geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/jsr88/AdminObjectDCB.java Sat May 27 00:56:38 2006
@@ -33,7 +33,7 @@
  * out again it'll be a little different, but that way this can be a DConfigBean
  * instead of a POJO (the loading code is in ConnectorDCB).
  *
- * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $
+ * @version $Rev$ $Date$
  */
 public class AdminObjectDCB extends DConfigBeanSupport {
     private AdminObjectInstance[] adminObjectInstance = new AdminObjectInstance[0];

Propchange: geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/jsr88/AdminObjectDCB.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/jsr88/AdminObjectDCB.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/jsr88/AdminObjectInstance.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/jsr88/AdminObjectInstance.java?rev=409817&r1=409816&r2=409817&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/jsr88/AdminObjectInstance.java (original)
+++ geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/jsr88/AdminObjectInstance.java Sat May 27 00:56:38 2006
@@ -25,7 +25,7 @@
  * Represents /connector/adminobject/adminobject-instance in the
  * Geronimo Connector deployment plan.
  *
- * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $
+ * @version $Rev$ $Date$
  */
 public class AdminObjectInstance extends ConfigHolder {
     private DDBean adminObject;

Propchange: geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/jsr88/AdminObjectInstance.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/jsr88/AdminObjectInstance.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/jsr88/ConfigHolder.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/jsr88/ConfigHolder.java?rev=409817&r1=409816&r2=409817&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/jsr88/ConfigHolder.java (original)
+++ geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/jsr88/ConfigHolder.java Sat May 27 00:56:38 2006
@@ -34,7 +34,7 @@
 /**
  * Base class for beans that hold an array of config property settings.
  *
- * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $
+ * @version $Rev$ $Date$
  */
 public abstract class ConfigHolder extends XmlBeanSupport  {
     final XpathListener xpathListener = new XpathListener() {

Propchange: geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/jsr88/ConfigHolder.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/jsr88/ConfigHolder.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/jsr88/ResourceAdapterInstance.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/jsr88/ResourceAdapterInstance.java?rev=409817&r1=409816&r2=409817&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/jsr88/ResourceAdapterInstance.java (original)
+++ geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/jsr88/ResourceAdapterInstance.java Sat May 27 00:56:38 2006
@@ -29,7 +29,7 @@
  * several instances per resource adapter, it's not 1:1 and this is not
  * a DConfigBean.
  *
- * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $
+ * @version $Rev$ $Date$
  */
 public class ResourceAdapterInstance extends ConfigHolder {
     private DDBean resourceAdapter;

Propchange: geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/jsr88/ResourceAdapterInstance.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/jsr88/ResourceAdapterInstance.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.1/modules/connector-builder/src/schema/geronimo-connector-1.1.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/connector-builder/src/schema/geronimo-connector-1.1.xsd
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/connector-builder/src/schema/geronimo-connector-1.1.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/branches/1.1/modules/connector-builder/src/test-resources/jms-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/connector-builder/src/test-resources/jms-plan.xml?rev=409817&r1=409816&r2=409817&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector-builder/src/test-resources/jms-plan.xml (original)
+++ geronimo/branches/1.1/modules/connector-builder/src/test-resources/jms-plan.xml Sat May 27 00:56:38 2006
@@ -12,7 +12,7 @@
     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: 356113 $ $Date: 2005-12-11 21:54:02 -0500 (Sun, 11 Dec 2005) $-->
+<!--$Rev$ $Date$-->
 <connector configId="TestJMSConfig" xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
     <dep:import xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
         <dep:groupId>geronimo</dep:groupId>

Propchange: geronimo/branches/1.1/modules/connector-builder/src/test-resources/jms-plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/connector-builder/src/test-resources/jms-plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/branches/1.1/modules/connector-builder/src/test-resources/plan-with-nulls.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/connector-builder/src/test-resources/plan-with-nulls.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/AdminObjectSource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/AdminObjectSource.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/AdminObjectSource.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/ConnectionFactorySource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/ConnectionFactorySource.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/ConnectionFactorySource.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java?rev=409817&r1=409816&r2=409817&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java (original)
+++ geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java Sat May 27 00:56:38 2006
@@ -46,7 +46,7 @@
 /**
  * Knows how to suck a Config ID out of a module and/or plan
  *
- * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $
+ * @version $Rev$ $Date$
  */
 public class ConfigIDExtractor {
 

Propchange: geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/GeronimoDeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/GeronimoDeploymentManager.java?rev=409817&r1=409816&r2=409817&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/GeronimoDeploymentManager.java (original)
+++ geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/GeronimoDeploymentManager.java Sat May 27 00:56:38 2006
@@ -24,7 +24,7 @@
 /**
  * Enhanced features for Geronimo deployment manager
  *
- * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $
+ * @version $Rev$ $Date$
  */
 public interface GeronimoDeploymentManager extends DeploymentManager, PluginInstaller {
     public URL[] getRepositories();

Propchange: geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/GeronimoDeploymentManager.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/GeronimoDeploymentManager.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/CommandContext.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/CommandContext.java?rev=409817&r1=409816&r2=409817&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/CommandContext.java (original)
+++ geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/CommandContext.java Sat May 27 00:56:38 2006
@@ -18,7 +18,7 @@
 
 
 /**
- * @version $Rev: 355877 $ $Date: 2005-12-11 13:48:27 +1100 (Sun, 11 Dec 2005) $
+ * @version $Rev$ $Date$
  */
 public class CommandContext {
     private boolean logErrors;

Propchange: geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/CommandContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/CommandContext.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/CommandContext.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandInstallCAR.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandInstallCAR.java?rev=409817&r1=409816&r2=409817&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandInstallCAR.java (original)
+++ geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandInstallCAR.java Sat May 27 00:56:38 2006
@@ -27,7 +27,7 @@
 /**
  * The CLI deployer logic to start.
  *
- * @version $Rev: 356097 $ $Date: 2005-12-11 20:29:03 -0500 (Sun, 11 Dec 2005) $
+ * @version $Rev$ $Date$
  */
 public class CommandInstallCAR extends AbstractCommand {
     public CommandInstallCAR() {

Propchange: geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandInstallCAR.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandInstallCAR.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListConfigurations.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListConfigurations.java?rev=409817&r1=409816&r2=409817&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListConfigurations.java (original)
+++ geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListConfigurations.java Sat May 27 00:56:38 2006
@@ -38,7 +38,7 @@
 /**
  * The CLI deployer logic to start.
  *
- * @version $Rev: 356097 $ $Date: 2005-12-11 20:29:03 -0500 (Sun, 11 Dec 2005) $
+ * @version $Rev$ $Date$
  */
 public class CommandListConfigurations extends AbstractCommand {
     public CommandListConfigurations() {

Propchange: geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListConfigurations.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandListConfigurations.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/CopyResourceContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/CopyResourceContext.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/CopyResourceContext.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentConfigurationManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentConfigurationManager.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentConfigurationManager.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/InPlaceResourceContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/InPlaceResourceContext.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/InPlaceResourceContext.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/ModuleIDBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/ModuleIDBuilder.java?rev=409817&r1=409816&r2=409817&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/ModuleIDBuilder.java (original)
+++ geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/ModuleIDBuilder.java Sat May 27 00:56:38 2006
@@ -26,7 +26,7 @@
  * an EAR may have a module ID with only an artifactId, and contain a web
  * app with no Geronimo plan and an EJB JAR with a module ID with no version.
  *
- * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $
+ * @version $Rev$ $Date$
  */
 public class ModuleIDBuilder {
     private Version defaultVersion;

Propchange: geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/ModuleIDBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/ModuleIDBuilder.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/ResourceContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/ResourceContext.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/ResourceContext.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/SingleFileHotDeployer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/SingleFileHotDeployer.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/SingleFileHotDeployer.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.1/modules/deployment/src/test/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/deployment/src/test/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/deployment/src/test/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.1/modules/installer-processing/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/installer-processing/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/installer-processing/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.1/modules/installer-processing/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/installer-processing/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/installer-processing/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.1/modules/installer-processing/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/installer-processing/maven.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/installer-processing/maven.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/branches/1.1/modules/installer-processing/project.properties
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 27 00:56:38 2006
@@ -1 +1 @@
-Date Author Id Revision Head URL
+Date Author Id Revision HeadURL

Modified: geronimo/branches/1.1/modules/installer-processing/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/installer-processing/project.xml?rev=409817&r1=409816&r2=409817&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/installer-processing/project.xml (original)
+++ geronimo/branches/1.1/modules/installer-processing/project.xml Sat May 27 00:56:38 2006
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 
-<!-- $Rev: 330381 $ $Date: 2005-11-02 18:02:55 -0500 (Wed, 02 Nov 2005) $ -->
+<!-- $Rev$ $Date$ -->
 <project>
     <pomVersion>3</pomVersion>
     <extend>../../etc/project.xml</extend>

Propchange: geronimo/branches/1.1/modules/installer-processing/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/installer-processing/project.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/installer-processing/project.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/branches/1.1/modules/installer-processing/src/java/org/apache/geronimo/installer/processing/ConfigInstaller.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/installer-processing/src/java/org/apache/geronimo/installer/processing/ConfigInstaller.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/installer-processing/src/java/org/apache/geronimo/installer/processing/ConfigInstaller.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.1/modules/installer-support/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/installer-support/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/installer-support/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.1/modules/installer-support/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/installer-support/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/installer-support/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.1/modules/installer-support/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/installer-support/maven.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/installer-support/maven.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/branches/1.1/modules/installer-support/project.properties
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 27 00:56:38 2006
@@ -1 +1 @@
-Date Author Id Revision Head URL
+Date Author Id Revision HeadURL

Modified: geronimo/branches/1.1/modules/installer-support/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/installer-support/project.xml?rev=409817&r1=409816&r2=409817&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/installer-support/project.xml (original)
+++ geronimo/branches/1.1/modules/installer-support/project.xml Sat May 27 00:56:38 2006
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 
-<!-- $Rev: 330381 $ $Date: 2005-11-02 18:02:55 -0500 (Wed, 02 Nov 2005) $ -->
+<!-- $Rev$ $Date$ -->
 <project>
     <pomVersion>3</pomVersion>
     <extend>../../etc/project.xml</extend>

Propchange: geronimo/branches/1.1/modules/installer-support/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/installer-support/project.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/installer-support/project.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/GeronimoConfigProcessor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/GeronimoConfigProcessor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/GeronimoConfigProcessor.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/PasswordGroup.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/PasswordGroup.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/PasswordGroup.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/ProcessPanelAutomationHelper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/ProcessPanelAutomationHelper.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/ProcessPanelAutomationHelper.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/ProcessingClient.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/ProcessingClient.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/ProcessingClient.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/Processor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/Processor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/Processor.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/RuleInputField.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/RuleInputField.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/RuleInputField.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/RuleTextField.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/RuleTextField.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/RuleTextField.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/ValidatePackSelections.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/ValidatePackSelections.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/ValidatePackSelections.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/ValidatePackSelectionsAutomationHelper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/ValidatePackSelectionsAutomationHelper.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/ValidatePackSelectionsAutomationHelper.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/Validator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/Validator.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/installer-support/src/java/com/izforge/izpack/panels/Validator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java?rev=409817&r1=409816&r2=409817&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java Sat May 27 00:56:38 2006
@@ -16,7 +16,7 @@
 import org.apache.geronimo.deployment.ModuleIDBuilder;
 
 /**
- * @version $Rev: 356097 $ $Date: 2005-12-11 17:29:03 -0800 (Sun, 11 Dec 2005) $
+ * @version $Rev$ $Date$
  */
 public class UnavailableModuleBuilder implements ModuleBuilder {
 

Propchange: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.1/modules/j2ee-builder/src/schema/geronimo-application-1.1.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/j2ee-builder/src/schema/geronimo-application-1.1.xsd
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/j2ee-builder/src/schema/geronimo-application-1.1.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/branches/1.1/modules/javamail-transport/src/java/org/apache/geronimo/javamail/authentication/ClientAuthenticator.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/javamail-transport/src/java/org/apache/geronimo/javamail/authentication/ClientAuthenticator.java?rev=409817&r1=409816&r2=409817&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/javamail-transport/src/java/org/apache/geronimo/javamail/authentication/ClientAuthenticator.java (original)
+++ geronimo/branches/1.1/modules/javamail-transport/src/java/org/apache/geronimo/javamail/authentication/ClientAuthenticator.java Sat May 27 00:56:38 2006
@@ -1,84 +1,84 @@
-/**
- *
- * Copyright 2003-2005 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.geronimo.javamail.authentication;
-
-import javax.mail.MessagingException;
-
-/**
- * Simplified version of the Java 5 SaslClient interface. This is used to
- * implement a javamail authentication framework that mimics the Sasl framework
- * on a 1.4.2 JVM. Only the methods required by the Javamail code are
- * implemented here, but it should be a simple migration to the fuller SASL
- * interface.
- */
-public interface ClientAuthenticator {
-    /**
-     * Evaluate a challenge and return a response that can be sent back to the
-     * server. Bot the challenge information and the response information are
-     * "raw data", minus any special encodings used by the transport. For
-     * example, SMTP DIGEST-MD5 authentication protocol passes information as
-     * Base64 encoded strings. That encoding must be removed before calling
-     * evaluateChallenge() and the resulting respose must be Base64 encoced
-     * before transmission to the server.
-     * 
-     * It is the authenticator's responsibility to keep track of the state of
-     * the evaluations. That is, if the authentication process requires multiple
-     * challenge/response cycles, then the authenticator needs to keep track of
-     * context of the challenges.
-     * 
-     * @param challenge
-     *            The challenge data.
-     * 
-     * @return An appropriate response for the challenge data.
-     */
-
-    public byte[] evaluateChallenge(byte[] challenge) throws MessagingException;
-
-    /**
-     * Indicates that the authenticator has data that should be sent when the
-     * authentication process is initiated. For example, the SMTP PLAIN
-     * authentication sends userid/password without waiting for a challenge
-     * response.
-     * 
-     * If this method returns true, then the initial response is retrieved using
-     * evaluateChallenge() passing null for the challenge information.
-     * 
-     * @return True if the challenge/response process starts with an initial
-     *         response on the client side.
-     */
-    public boolean hasInitialResponse();
-
-    /**
-     * Indicates whether the client believes the challenge/response sequence is
-     * now complete.
-     * 
-     * @return true if the client has evaluated what it believes to be the last
-     *         challenge, false if there are additional stages to evaluate.
-     */
-
-    public boolean isComplete();
-
-    /**
-     * Return the mechanism name implemented by this authenticator.
-     * 
-     * @return The string name of the authentication mechanism. This name should
-     *         match the names commonly used by the mail servers (e.g., "PLAIN",
-     *         "LOGIN", "DIGEST-MD5", etc.).
-     */
-    public String getMechanismName();
-}
+/**
+ *
+ * Copyright 2003-2005 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.geronimo.javamail.authentication;
+
+import javax.mail.MessagingException;
+
+/**
+ * Simplified version of the Java 5 SaslClient interface. This is used to
+ * implement a javamail authentication framework that mimics the Sasl framework
+ * on a 1.4.2 JVM. Only the methods required by the Javamail code are
+ * implemented here, but it should be a simple migration to the fuller SASL
+ * interface.
+ */
+public interface ClientAuthenticator {
+    /**
+     * Evaluate a challenge and return a response that can be sent back to the
+     * server. Bot the challenge information and the response information are
+     * "raw data", minus any special encodings used by the transport. For
+     * example, SMTP DIGEST-MD5 authentication protocol passes information as
+     * Base64 encoded strings. That encoding must be removed before calling
+     * evaluateChallenge() and the resulting respose must be Base64 encoced
+     * before transmission to the server.
+     * 
+     * It is the authenticator's responsibility to keep track of the state of
+     * the evaluations. That is, if the authentication process requires multiple
+     * challenge/response cycles, then the authenticator needs to keep track of
+     * context of the challenges.
+     * 
+     * @param challenge
+     *            The challenge data.
+     * 
+     * @return An appropriate response for the challenge data.
+     */
+
+    public byte[] evaluateChallenge(byte[] challenge) throws MessagingException;
+
+    /**
+     * Indicates that the authenticator has data that should be sent when the
+     * authentication process is initiated. For example, the SMTP PLAIN
+     * authentication sends userid/password without waiting for a challenge
+     * response.
+     * 
+     * If this method returns true, then the initial response is retrieved using
+     * evaluateChallenge() passing null for the challenge information.
+     * 
+     * @return True if the challenge/response process starts with an initial
+     *         response on the client side.
+     */
+    public boolean hasInitialResponse();
+
+    /**
+     * Indicates whether the client believes the challenge/response sequence is
+     * now complete.
+     * 
+     * @return true if the client has evaluated what it believes to be the last
+     *         challenge, false if there are additional stages to evaluate.
+     */
+
+    public boolean isComplete();
+
+    /**
+     * Return the mechanism name implemented by this authenticator.
+     * 
+     * @return The string name of the authentication mechanism. This name should
+     *         match the names commonly used by the mail servers (e.g., "PLAIN",
+     *         "LOGIN", "DIGEST-MD5", etc.).
+     */
+    public String getMechanismName();
+}

Propchange: geronimo/branches/1.1/modules/javamail-transport/src/java/org/apache/geronimo/javamail/authentication/ClientAuthenticator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/javamail-transport/src/java/org/apache/geronimo/javamail/authentication/ClientAuthenticator.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/javamail-transport/src/java/org/apache/geronimo/javamail/authentication/ClientAuthenticator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.1/modules/javamail-transport/src/java/org/apache/geronimo/javamail/authentication/CramMD5Authenticator.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/javamail-transport/src/java/org/apache/geronimo/javamail/authentication/CramMD5Authenticator.java?rev=409817&r1=409816&r2=409817&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/javamail-transport/src/java/org/apache/geronimo/javamail/authentication/CramMD5Authenticator.java (original)
+++ geronimo/branches/1.1/modules/javamail-transport/src/java/org/apache/geronimo/javamail/authentication/CramMD5Authenticator.java Sat May 27 00:56:38 2006
@@ -1,173 +1,173 @@
-/**
- *
- * Copyright 2003-2005 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.geronimo.javamail.authentication;
-
-import java.io.UnsupportedEncodingException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-import javax.mail.MessagingException;
-
-import org.apache.geronimo.mail.util.Hex;
-
-public class CramMD5Authenticator implements ClientAuthenticator {
-
-    // the user we're authenticating
-    protected String username;
-
-    // the user's password (the "shared secret")
-    protected String password;
-
-    // indicates whether we've gone through the entire challenge process.
-    protected boolean complete = false;
-
-    /**
-     * Main constructor.
-     * 
-     * @param username
-     *            The login user name.
-     * @param password
-     *            The login password.
-     */
-    public CramMD5Authenticator(String username, String password) {
-        this.username = username;
-        this.password = password;
-    }
-
-    /**
-     * Respond to the hasInitialResponse query. This mechanism does not have an
-     * initial response.
-     * 
-     * @return Always returns false.
-     */
-    public boolean hasInitialResponse() {
-        return false;
-    }
-
-    /**
-     * Indicate whether the challenge/response process is complete.
-     * 
-     * @return True if the last challenge has been processed, false otherwise.
-     */
-    public boolean isComplete() {
-        return complete;
-    }
-
-    /**
-     * Retrieve the authenticator mechanism name.
-     * 
-     * @return Always returns the string "CRAM-MD5"
-     */
-    public String getMechanismName() {
-        return "CRAM-MD5";
-    }
-
-    /**
-     * Evaluate a CRAM-MD5 login challenge, returning the a result string that
-     * should satisfy the clallenge.
-     * 
-     * @param challenge
-     *            The decoded challenge data, as a byte array.
-     * 
-     * @return A formatted challege response, as an array of bytes.
-     * @exception MessagingException
-     */
-    public byte[] evaluateChallenge(byte[] challenge) throws MessagingException {
-        // we create the challenge from the userid and password information (the
-        // "shared secret").
-        byte[] passBytes;
-
-        try {
-            // get the password in an UTF-8 encoding to create the token
-            passBytes = password.getBytes("UTF-8");
-            // compute the password digest using the key
-            byte[] digest = computeCramDigest(passBytes, challenge);
-
-            // create a unified string using the user name and the hex encoded
-            // digest
-            String responseString = username + " " + new String(Hex.encode(digest));
-            complete = true;
-            return responseString.getBytes();
-        } catch (UnsupportedEncodingException e) {
-            // got an error, fail this
-            throw new MessagingException("Invalid character encodings");
-        }
-
-    }
-
-    /**
-     * Compute a CRAM digest using the hmac_md5 algorithm. See the description
-     * of RFC 2104 for algorithm details.
-     * 
-     * @param key
-     *            The key (K) for the calculation.
-     * @param input
-     *            The encrypted text value.
-     * 
-     * @return The computed digest, as a byte array value.
-     * @exception NoSuchAlgorithmException
-     */
-    protected byte[] computeCramDigest(byte[] key, byte[] input) throws MessagingException {
-        // CRAM digests are computed using the MD5 algorithm.
-        MessageDigest digest;
-        try {
-            digest = MessageDigest.getInstance("MD5");
-        } catch (NoSuchAlgorithmException e) {
-            throw new MessagingException("Unable to access MD5 message digest", e);
-        }
-
-        // if the key is longer than 64 bytes, then we get a digest of the key
-        // and use that instead.
-        // this is required by RFC 2104.
-        if (key.length > 64) {
-            digest.update(key);
-            key = digest.digest();
-        }
-
-        // now we create two 64 bit padding keys, initialized with the key
-        // information.
-        byte[] ipad = new byte[64];
-        byte[] opad = new byte[64];
-
-        System.arraycopy(key, 0, ipad, 0, key.length);
-        System.arraycopy(key, 0, opad, 0, key.length);
-
-        // and these versions are munged by XORing with "magic" values.
-
-        for (int i = 0; i < 64; i++) {
-            ipad[i] ^= 0x36;
-            opad[i] ^= 0x5c;
-        }
-
-        // now there are a pair of MD5 operations performed, and inner and an
-        // outer. The spec defines this as
-        // H(K XOR opad, H(K XOR ipad, text)), where H is the MD5 operation.
-
-        // inner operation
-        digest.reset();
-        digest.update(ipad);
-        digest.update(input); // this appends the text to the pad
-        byte[] md5digest = digest.digest();
-
-        // outer operation
-        digest.reset();
-        digest.update(opad);
-        digest.update(md5digest);
-        return digest.digest(); // final result
-    }
-}
+/**
+ *
+ * Copyright 2003-2005 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.geronimo.javamail.authentication;
+
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+import javax.mail.MessagingException;
+
+import org.apache.geronimo.mail.util.Hex;
+
+public class CramMD5Authenticator implements ClientAuthenticator {
+
+    // the user we're authenticating
+    protected String username;
+
+    // the user's password (the "shared secret")
+    protected String password;
+
+    // indicates whether we've gone through the entire challenge process.
+    protected boolean complete = false;
+
+    /**
+     * Main constructor.
+     * 
+     * @param username
+     *            The login user name.
+     * @param password
+     *            The login password.
+     */
+    public CramMD5Authenticator(String username, String password) {
+        this.username = username;
+        this.password = password;
+    }
+
+    /**
+     * Respond to the hasInitialResponse query. This mechanism does not have an
+     * initial response.
+     * 
+     * @return Always returns false.
+     */
+    public boolean hasInitialResponse() {
+        return false;
+    }
+
+    /**
+     * Indicate whether the challenge/response process is complete.
+     * 
+     * @return True if the last challenge has been processed, false otherwise.
+     */
+    public boolean isComplete() {
+        return complete;
+    }
+
+    /**
+     * Retrieve the authenticator mechanism name.
+     * 
+     * @return Always returns the string "CRAM-MD5"
+     */
+    public String getMechanismName() {
+        return "CRAM-MD5";
+    }
+
+    /**
+     * Evaluate a CRAM-MD5 login challenge, returning the a result string that
+     * should satisfy the clallenge.
+     * 
+     * @param challenge
+     *            The decoded challenge data, as a byte array.
+     * 
+     * @return A formatted challege response, as an array of bytes.
+     * @exception MessagingException
+     */
+    public byte[] evaluateChallenge(byte[] challenge) throws MessagingException {
+        // we create the challenge from the userid and password information (the
+        // "shared secret").
+        byte[] passBytes;
+
+        try {
+            // get the password in an UTF-8 encoding to create the token
+            passBytes = password.getBytes("UTF-8");
+            // compute the password digest using the key
+            byte[] digest = computeCramDigest(passBytes, challenge);
+
+            // create a unified string using the user name and the hex encoded
+            // digest
+            String responseString = username + " " + new String(Hex.encode(digest));
+            complete = true;
+            return responseString.getBytes();
+        } catch (UnsupportedEncodingException e) {
+            // got an error, fail this
+            throw new MessagingException("Invalid character encodings");
+        }
+
+    }
+
+    /**
+     * Compute a CRAM digest using the hmac_md5 algorithm. See the description
+     * of RFC 2104 for algorithm details.
+     * 
+     * @param key
+     *            The key (K) for the calculation.
+     * @param input
+     *            The encrypted text value.
+     * 
+     * @return The computed digest, as a byte array value.
+     * @exception NoSuchAlgorithmException
+     */
+    protected byte[] computeCramDigest(byte[] key, byte[] input) throws MessagingException {
+        // CRAM digests are computed using the MD5 algorithm.
+        MessageDigest digest;
+        try {
+            digest = MessageDigest.getInstance("MD5");
+        } catch (NoSuchAlgorithmException e) {
+            throw new MessagingException("Unable to access MD5 message digest", e);
+        }
+
+        // if the key is longer than 64 bytes, then we get a digest of the key
+        // and use that instead.
+        // this is required by RFC 2104.
+        if (key.length > 64) {
+            digest.update(key);
+            key = digest.digest();
+        }
+
+        // now we create two 64 bit padding keys, initialized with the key
+        // information.
+        byte[] ipad = new byte[64];
+        byte[] opad = new byte[64];
+
+        System.arraycopy(key, 0, ipad, 0, key.length);
+        System.arraycopy(key, 0, opad, 0, key.length);
+
+        // and these versions are munged by XORing with "magic" values.
+
+        for (int i = 0; i < 64; i++) {
+            ipad[i] ^= 0x36;
+            opad[i] ^= 0x5c;
+        }
+
+        // now there are a pair of MD5 operations performed, and inner and an
+        // outer. The spec defines this as
+        // H(K XOR opad, H(K XOR ipad, text)), where H is the MD5 operation.
+
+        // inner operation
+        digest.reset();
+        digest.update(ipad);
+        digest.update(input); // this appends the text to the pad
+        byte[] md5digest = digest.digest();
+
+        // outer operation
+        digest.reset();
+        digest.update(opad);
+        digest.update(md5digest);
+        return digest.digest(); // final result
+    }
+}

Propchange: geronimo/branches/1.1/modules/javamail-transport/src/java/org/apache/geronimo/javamail/authentication/CramMD5Authenticator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1/modules/javamail-transport/src/java/org/apache/geronimo/javamail/authentication/CramMD5Authenticator.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.1/modules/javamail-transport/src/java/org/apache/geronimo/javamail/authentication/CramMD5Authenticator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain