incubator-ftpserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
Subject svn commit: r602564 - in /incubator/ftpserver/trunk: core/pom.xml pom.xml ssl-tests/src/test/org/apache/ftpserver/ssl/IOCipherSuitesTest.java ssl-tests/src/test/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java
Date Sat, 08 Dec 2007 21:42:49 GMT
Author: ngn
Date: Sat Dec  8 13:42:48 2007
New Revision: 602564

URL: http://svn.apache.org/viewvc?rev=602564&view=rev
Log:
Restructuring to maven conventions

Modified:
    incubator/ftpserver/trunk/core/pom.xml
    incubator/ftpserver/trunk/pom.xml
    incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/IOCipherSuitesTest.java
    incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java

Modified: incubator/ftpserver/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/pom.xml?rev=602564&r1=602563&r2=602564&view=diff
==============================================================================
--- incubator/ftpserver/trunk/core/pom.xml (original)
+++ incubator/ftpserver/trunk/core/pom.xml Sat Dec  8 13:42:48 2007
@@ -17,7 +17,6 @@
   <build>
     <resources>
       <resource>
-        <directory>src/java</directory>
         <includes>
           <include>**/*.properties</include>
         </includes>
@@ -25,7 +24,6 @@
     </resources>
     <testResources>
       <testResource>
-        <directory>src/test</directory>
         <includes>
           <include>*.properties</include>
         </includes>

Modified: incubator/ftpserver/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/pom.xml?rev=602564&r1=602563&r2=602564&view=diff
==============================================================================
--- incubator/ftpserver/trunk/pom.xml (original)
+++ incubator/ftpserver/trunk/pom.xml Sat Dec  8 13:42:48 2007
@@ -100,8 +100,6 @@
         <url>http://svn.apache.org/viewvc/incubator/ftpserver/trunk</url>
     </scm>
     <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <testSourceDirectory>src/test</testSourceDirectory>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

Modified: incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/IOCipherSuitesTest.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/IOCipherSuitesTest.java?rev=602564&r1=602563&r2=602564&view=diff
==============================================================================
--- incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/IOCipherSuitesTest.java
(original)
+++ incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/IOCipherSuitesTest.java
Sat Dec  8 13:42:48 2007
@@ -1,34 +1,34 @@
-/*
- * 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.ftpserver.ssl;
-
-import java.util.Properties;
-
-import org.apache.ftpserver.listener.io.IOListener;
-
-public class IOCipherSuitesTest extends MinaCipherSuitesTest {
-
-    protected Properties createConfig() {
-        Properties config = super.createConfig();
-        config.setProperty("config.listeners.default.class", IOListener.class.getName());
-
-        return config;
-    }
-}
+/*
+ * 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.ftpserver.ssl;
+
+import java.util.Properties;
+
+import org.apache.ftpserver.listener.io.IOListener;
+
+public class IOCipherSuitesTest extends MinaCipherSuitesTest {
+
+    protected Properties createConfig() {
+        Properties config = super.createConfig();
+        config.setProperty("config.listeners.default.class", IOListener.class.getName());
+
+        return config;
+    }
+}

Modified: incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java?rev=602564&r1=602563&r2=602564&view=diff
==============================================================================
--- incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java
(original)
+++ incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java
Sat Dec  8 13:42:48 2007
@@ -1,80 +1,80 @@
-/*
- * 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.ftpserver.ssl;
-
-import java.util.Properties;
-
-import javax.net.ssl.SSLHandshakeException;
-
-import org.apache.commons.net.ftp.FTPSClient;
-
-public class MinaCipherSuitesTest extends SSLTestTemplate {
-
-    protected String getAuthValue() {
-        return "TLS";
-    }
-    
-    protected Properties createConfig() {
-        Properties config = super.createConfig();
-        config.setProperty("config.listeners.default.implicitSsl",
-        "true");
-
-        config.setProperty("config.listeners.default.ssl.enabledCipherSuites", "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA");
-
-        return config;
-    }
-
-    protected FTPSClient createFTPClient() throws Exception {
-        return new FTPSClient(true);
-    }
-
-    protected void doConnect() throws Exception {
-    }
-
-    
-    /*
-     * Only certain cipher suites will work with the keys and protocol 
-     * we're using for this test. 
-     * Two suites known to work is:
-     *  * SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA
-     *  * SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA
-     */
-    public void testEnabled() throws Exception {
-        
-        client.setEnabledCipherSuites(new String[]{ 
-                "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA"});
-        
-        super.doConnect();
-    }
-    
-    public void testDisabled() throws Exception {
-        
-        client.setEnabledCipherSuites(new String[]{ 
-                "SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA"});
-        
-        try {
-            super.doConnect();
-            fail("Must throw SSLHandshakeException"); 
-        } catch(SSLHandshakeException e) {
-            // OK
-        }
-    }
-
-}
+/*
+ * 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.ftpserver.ssl;
+
+import java.util.Properties;
+
+import javax.net.ssl.SSLHandshakeException;
+
+import org.apache.commons.net.ftp.FTPSClient;
+
+public class MinaCipherSuitesTest extends SSLTestTemplate {
+
+    protected String getAuthValue() {
+        return "TLS";
+    }
+    
+    protected Properties createConfig() {
+        Properties config = super.createConfig();
+        config.setProperty("config.listeners.default.implicitSsl",
+        "true");
+
+        config.setProperty("config.listeners.default.ssl.enabledCipherSuites", "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA");
+
+        return config;
+    }
+
+    protected FTPSClient createFTPClient() throws Exception {
+        return new FTPSClient(true);
+    }
+
+    protected void doConnect() throws Exception {
+    }
+
+    
+    /*
+     * Only certain cipher suites will work with the keys and protocol 
+     * we're using for this test. 
+     * Two suites known to work is:
+     *  * SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA
+     *  * SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA
+     */
+    public void testEnabled() throws Exception {
+        
+        client.setEnabledCipherSuites(new String[]{ 
+                "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA"});
+        
+        super.doConnect();
+    }
+    
+    public void testDisabled() throws Exception {
+        
+        client.setEnabledCipherSuites(new String[]{ 
+                "SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA"});
+        
+        try {
+            super.doConnect();
+            fail("Must throw SSLHandshakeException"); 
+        } catch(SSLHandshakeException e) {
+            // OK
+        }
+    }
+
+}



Mime
View raw message