Merge pull request #137 from neo4j/1.0-fix-red-build

Change to use the new scripts on windows

Author: jakewins

driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketConnection.java

@@ -48,7 +48,7 @@ public class SocketConnection implements Connection
 
     public SocketConnection( String host, int port, Config config )
     {
-        Logger logger = config.logging().getLog( getClass().getName() );
+        Logger logger = config.logging().getLog( String.valueOf( System.currentTimeMillis() ) );
 
         if( logger.isDebugEnabled() )
         {

driver/src/main/java/org/neo4j/driver/internal/connector/socket/TLSSocketChannel.java

@@ -446,6 +446,7 @@ public void close() throws IOException
             // Check res statuses
 
             // Send close message to peer
+            cipherOut.flip();
             while ( cipherOut.hasRemaining() )
             {
                 int num = channel.write( cipherOut );
@@ -455,6 +456,7 @@ public void close() throws IOException
                     break;
                 }
             }
+            cipherOut.clear();
         }
         // Close transport
         channel.close();

driver/src/main/java/org/neo4j/driver/internal/logging/ConsoleLogging.java

@@ -46,17 +46,17 @@
  */
 public class ConsoleLogging implements Logging
 {
-    private final ConsoleLogger logger;
+    private final Level level;
 
     public ConsoleLogging( Level level )
     {
-        this.logger = new ConsoleLogger( this.getClass().getName(), level );
+        this.level = level;
     }
 
     @Override
     public Logger getLog( String name )
     {
-        return this.logger;
+        return new ConsoleLogger( name, level );
     }
 
     public static class ConsoleLogger extends JULogger
@@ -92,7 +92,8 @@ private static class ShortFormatter extends Formatter
         public String format( LogRecord record )
         {
             StringBuilder builder = new StringBuilder( 1000 );
-            builder.append( dateFormat.format( new Date( record.getMillis() ) ) ).append( " - " );
+            builder.append( dateFormat.format( new Date( record.getMillis() ) ) );
+            builder.append( " [" ).append( record.getLoggerName() ).append( "]" ).append( " - " );
             // builder.append( "[" ).append( record.getSourceClassName() ).append( "." );
             // builder.append( record.getSourceMethodName() ).append( "] - " );
             // builder.append( "[" ).append( record.getLevel() ).append( "] - " );

driver/src/test/java/org/neo4j/driver/v1/util/Neo4jDefaultInstaller.java

@@ -55,7 +55,7 @@ String neo4jPackageUrl()
     @Override
     File neo4jTarball()
     {
-        return new File( "./target/" + version + ".tar.gz" );
+        return new File( Neo4jInstaller.neo4jDir, version + ".tar.gz" );
     }
 
     @Override

driver/src/test/java/org/neo4j/driver/v1/util/Neo4jInstaller.java

@@ -46,7 +46,7 @@ public static boolean isWindows()
 
     static final String version = System.getProperty( "version", "3.0.0-NIGHTLY" );
 
-    private static final File neo4jDir = new File( "../target/neo4j" );
+    public static final File neo4jDir = new File( "../target/neo4j" );
 
     public static final File neo4jHomeDir = new File( neo4jDir, version );
     public static final File dbDir = new File( neo4jHomeDir, "data/graph.db" );

driver/src/test/java/org/neo4j/driver/v1/util/Neo4jRunner.java

@@ -53,7 +53,7 @@ private enum ServerStatus
 
     private Neo4jSettings currentSettings = Neo4jSettings.DEFAULT;
     private Driver currentDriver;
-    private Config testConfig = Config.build().withEncryptionLevel( Config.EncryptionLevel.NONE ).toConfig();
+    public static final Config TEST_CONFIG = Config.build().withEncryptionLevel( Config.EncryptionLevel.NONE ).toConfig();
 
     private Neo4jInstaller installer = Neo4jInstaller.Neo4jInstallerFactory.create();
 
@@ -157,7 +157,7 @@ private void clear( Neo4jSettings config ) throws Exception
             throw new IllegalStateException( "Failed to start server" );
         }
         awaitServerStatusOrFail( ServerStatus.ONLINE );
-        currentDriver = GraphDatabase.driver( serverURI(), testConfig );
+        currentDriver = GraphDatabase.driver( serverURI(), TEST_CONFIG);
     }
 
     private boolean updateServerSettings( Neo4jSettings settingsUpdate )
@@ -234,7 +234,7 @@ private ServerStatus serverStatus() throws IOException, InterruptedException
         try
         {
             URI uri = serverURI();
-            SocketClient client = new SocketClient( uri.getHost(), uri.getPort(), testConfig, new DevNullLogger() );
+            SocketClient client = new SocketClient( uri.getHost(), uri.getPort(), TEST_CONFIG, new DevNullLogger() );
             client.start();
             client.stop();
             return ServerStatus.ONLINE;

driver/src/test/java/org/neo4j/driver/v1/util/Neo4jSettings.java

@@ -89,8 +89,8 @@ public boolean equals( Object o )
     public Neo4jSettings usingEncryptionKeyAndCert( File key, File cert )
     {
         return updateWith( map(
-                TLS_CERT_KEY, cert.getAbsolutePath(),
-                TLS_KEY_KEY, key.getAbsolutePath()
+                TLS_CERT_KEY, cert.getAbsolutePath().replaceAll("\\\\", "/"),
+                TLS_KEY_KEY, key.getAbsolutePath().replaceAll("\\\\", "/")
         ));
     }
 

driver/src/test/java/org/neo4j/driver/v1/util/Neo4jWindowsInstaller.java

@@ -35,32 +35,31 @@ public class Neo4jWindowsInstaller extends Neo4jInstaller
 {
     private static final String winPackageUrl =
             format( "http://alpha.neohq.net/dist/neo4j-enterprise-%s-windows.zip", version );
-    private static final String serviceName = "neo4j-driver-test-server";
 
     @Override
     public void installNeo4j() throws IOException
     {
         super.installNeo4j();
 
-        runPowershellScript( format( "Install-Neo4jServer -Neo4jServer %s -Name %s", neo4jHomeDir, serviceName ) );
+        runPowershellScript( "install-service" );
     }
 
     @Override
     public void uninstallNeo4j() throws IOException
     {
-        runPowershellScript( format( "Uninstall-Neo4jServer -Neo4jServer %s -ServiceName %s", neo4jHomeDir, serviceName ) );
+        runPowershellScript( "uninstall-service" );
     }
 
     @Override
     public int startNeo4j() throws IOException
     {
-        return runPowershellScript( format( "Start-Neo4jServer -Neo4jServer %s -ServiceName %s", neo4jHomeDir, serviceName ) );
+        return runPowershellScript( "start" );
     }
 
     @Override
     public int stopNeo4j() throws IOException
     {
-        return runPowershellScript( format( "Stop-Neo4jServer -Neo4jServer %s -ServiceName %s", neo4jHomeDir, serviceName) );
+        return runPowershellScript( "stop" );
     }
 
     @Override
@@ -73,7 +72,7 @@ String neo4jPackageUrl()
     @Override
     File neo4jTarball()
     {
-        return new File( "./target/" + version + ".zip" );
+        return new File( Neo4jInstaller.neo4jDir, version + ".zip" );
     }
 
     @Override
@@ -86,8 +85,6 @@ private int runPowershellScript( String cmd ) throws IOException
     {
         return runCommand(
                 "powershell.exe",
-                "-ExecutionPolicy", "RemoteSigned",
-                format( "Import-Module %s", new File( neo4jHomeDir, "bin/Neo4j-Management/Neo4j-Management.psm1" ).getAbsolutePath() ),
-                format( "; %s", cmd ) );
+                format( "%s %s", new File(neo4jHomeDir, "bin/neo4j.bat").getAbsolutePath(), cmd ) );
     }
 }