Merge pull request #1134 from myronkscott/adopt_new_api

Adopt new api

Author: Myron Scott

.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * 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.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.6";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}

.mvn/wrapper/maven-wrapper.jar

@@ -0,0 +1,2 @@
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo1.maven.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~
+  ~  The contents of this file are subject to the Terracotta Public 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://terracotta.org/legal/terracotta-public-license.
+  ~
+  ~  Software distributed under the License is distributed on an "AS IS" basis,
+  ~  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+  ~  the specific language governing rights and limitations under the License.
+  ~
+  ~  The Covered Software is Terracotta Core.
+  ~
+  ~  The Initial Developer of the Covered Software is
+  ~  Terracotta, Inc., a Software AG company
+  ~
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>org.terracotta.internal</groupId>
+    <artifactId>build-parent</artifactId>
+    <version>5.7-SNAPSHOT</version>
+    <relativePath>../build-parent</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.terracotta.internal</groupId>
+  <artifactId>common-spi</artifactId>
+  <properties>
+    <java.build.version>1.8</java.build.version>
+  </properties>
+
+  <dependencies>
+  </dependencies>
+</project>

common-spi/pom.xml

@@ -10,7 +10,7 @@
  *  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
  *  the specific language governing rights and limitations under the License.
  *
- *  The Covered Software is Terracotta Core.
+ *  The Covered Software is common SPI.
  *
  *  The Initial Developer of the Covered Software is
  *  Terracotta, Inc., a Software AG company

common/src/main/java/com/tc/net/core/AbstractBufferManager.java renamed to common-spi/src/main/java/com/tc/net/core/AbstractBufferManager.java

@@ -10,7 +10,7 @@
  *  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
  *  the specific language governing rights and limitations under the License.
  *
- *  The Covered Software is Terracotta Core.
+ *  The Covered Software is common SPI.
  *
  *  The Initial Developer of the Covered Software is
  *  Terracotta, Inc., a Software AG company

common/src/main/java/com/tc/net/core/BufferManager.java renamed to common-spi/src/main/java/com/tc/net/core/BufferManager.java

@@ -10,7 +10,7 @@
  *  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
  *  the specific language governing rights and limitations under the License.
  *
- *  The Covered Software is Terracotta Core.
+ *  The Covered Software is common SPI.
  *
  *  The Initial Developer of the Covered Software is
  *  Terracotta, Inc., a Software AG company

common/src/main/java/com/tc/net/core/BufferManagerFactory.java renamed to common-spi/src/main/java/com/tc/net/core/BufferManagerFactory.java

@@ -10,19 +10,20 @@
  *  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
  *  the specific language governing rights and limitations under the License.
  *
- *  The Covered Software is Terracotta Core.
+ *  The Covered Software is common SPI.
  *
  *  The Initial Developer of the Covered Software is
  *  Terracotta, Inc., a Software AG company
  *
  */
-package com.tc.util;
+package com.tc.net.core;
 
-import java.util.Set;
+import java.util.Properties;
 
 /**
- *
  */
-public interface ProductCapabilities {
-  Set<ProductID> supportedClients();
+public interface BufferManagerFactorySupplier {
+
+  BufferManagerFactory createBufferManagerFactory(Properties properties);
+
 }

tc-messaging/src/main/java/com/tc/util/ProductCapabilities.java renamed to common-spi/src/main/java/com/tc/net/core/BufferManagerFactorySupplier.java

@@ -17,16 +17,15 @@
  *
  */
 
-package com.tc.util;
+package com.tc.net.core;
 
 /**
- * @author tim
  */
 public enum ProductID {
-  DIAGNOSTIC(true, false, false, false), 
-  INFORMATIONAL(true, true, true, false), 
-  STRIPE(false, true, true, false), 
-  SERVER(false, false, true, false), 
+  DIAGNOSTIC(true, false, false, false),
+  INFORMATIONAL(true, true, true, false),
+  STRIPE(false, true, true, false),
+  SERVER(false, false, true, false),
   PERMANENT(false, true, true, true);
 
   private final boolean internal;
@@ -44,19 +43,19 @@ public enum ProductID {
   public boolean isInternal() {
     return internal;
   }
-  
+
   public boolean isReconnectEnabled() {
     return reconnect;
   }
 
   public boolean isRedirectEnabled() {
     return redirect;
   }
-  
+
   public boolean isPermanent() {
     return permanent;
   }
-  
+
   @Override
   public String toString() {
     return name().charAt(0) + name().substring(1).toLowerCase();

tc-messaging/src/main/java/com/tc/util/ProductID.java renamed to common-spi/src/main/java/com/tc/net/core/ProductID.java

@@ -10,7 +10,7 @@
  *  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
  *  the specific language governing rights and limitations under the License.
  *
- *  The Covered Software is Terracotta Core.
+ *  The Covered Software is common SPI.
  *
  *  The Initial Developer of the Covered Software is
  *  Terracotta, Inc., a Software AG company
@@ -25,6 +25,6 @@ public interface PrettyPrintable {
   default PrettyPrinter prettyPrint(PrettyPrinter out) {
     return out.println(getStateMap());
   }
-  
+
   public Map<String, ?> getStateMap();
 }