Repository: incubator-reef Updated Branches: refs/heads/master 722d8c43c -> 492da34a0
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/492da34a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestBridgeClient.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestBridgeClient.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestBridgeClient.cs index 58922fe..3ef579b 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestBridgeClient.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestBridgeClient.cs @@ -73,7 +73,7 @@ namespace Org.Apache.REEF.Tests.Functional.Bridge arguments.Add(runOnYarn.ToString()); arguments.Add(Constants.BridgeLaunchClass); arguments.Add("."); - arguments.Add(Path.Combine(_binFolder, Constants.BridgeJarFileName)); + arguments.Add(Path.Combine(_binFolder, Constants.JavaBridgeJarFileName)); arguments.Add(Path.Combine(_binFolder, _cmdFile)); ProcessStartInfo startInfo = new ProcessStartInfo() http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/492da34a/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs index 582ad26..0654800 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs @@ -51,7 +51,7 @@ namespace Org.Apache.REEF.Tests.Functional private bool _onLocalRuntime = false; private readonly string _className = Constants.BridgeLaunchClass; private readonly string _clrFolder = "."; - private readonly string _reefJar = Path.Combine(_binFolder, Constants.BridgeJarFileName); + private readonly string _reefJar = Path.Combine(_binFolder, Constants.JavaBridgeJarFileName); private readonly string _runCommand = Path.Combine(_binFolder, _cmdFile); // TODO: once things stablize, we would like to toggle this to be false and only enable when needed for debugging test failures. http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/492da34a/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj b/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj index b697953..6301c29 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj +++ b/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj @@ -126,9 +126,13 @@ under the License. <Project>{1b983182-9c30-464c-948d-f87eb93a8240}</Project> <Name>Org.Apache.REEF.Evaluator</Name> </ProjectReference> + <ProjectReference Include="..\Org.Apache.REEF.Bridge\Org.Apache.REEF.Bridge.vcxproj"> + <Project>{4e69d40a-26d6-4d4a-b96d-729946c07fe1}</Project> + <Name>Org.Apache.REEF.Bridge</Name> + </ProjectReference> </ItemGroup> <ItemGroup> - <Content Include="bin\reef-bridge-0.11.0-incubating-SNAPSHOT-shaded.jar"> + <Content Include="bin\reef-bridge-java-0.11.0-incubating-SNAPSHOT-shaded.jar"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> </ItemGroup> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/492da34a/lang/cs/Org.Apache.REEF.Tests/bin/reef-bridge-0.11.0-incubating-SNAPSHOT-shaded.jar ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/bin/reef-bridge-0.11.0-incubating-SNAPSHOT-shaded.jar b/lang/cs/Org.Apache.REEF.Tests/bin/reef-bridge-0.11.0-incubating-SNAPSHOT-shaded.jar deleted file mode 100644 index c4a6fc7..0000000 Binary files a/lang/cs/Org.Apache.REEF.Tests/bin/reef-bridge-0.11.0-incubating-SNAPSHOT-shaded.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/492da34a/lang/cs/Org.Apache.REEF.Tests/bin/reef-bridge-java-0.11.0-incubating-SNAPSHOT-shaded.jar ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/bin/reef-bridge-java-0.11.0-incubating-SNAPSHOT-shaded.jar b/lang/cs/Org.Apache.REEF.Tests/bin/reef-bridge-java-0.11.0-incubating-SNAPSHOT-shaded.jar new file mode 100644 index 0000000..24e8b02 Binary files /dev/null and b/lang/cs/Org.Apache.REEF.Tests/bin/reef-bridge-java-0.11.0-incubating-SNAPSHOT-shaded.jar differ http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/492da34a/lang/cs/Org.Apache.REEF.sln ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.sln b/lang/cs/Org.Apache.REEF.sln index 40ac1ca..981b3ad 100644 Binary files a/lang/cs/Org.Apache.REEF.sln and b/lang/cs/Org.Apache.REEF.sln differ http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/492da34a/lang/cs/build.props ---------------------------------------------------------------------- diff --git a/lang/cs/build.props b/lang/cs/build.props index 29b04fe..c7fc616 100644 --- a/lang/cs/build.props +++ b/lang/cs/build.props @@ -23,17 +23,6 @@ under the License. </PropertyGroup> <!-- Common build configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <PlatformTarget>AnyCPU</PlatformTarget> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <PlatformTarget>AnyCPU</PlatformTarget> - </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> <PlatformTarget>AnyCPU</PlatformTarget> <DebugSymbols>true</DebugSymbols> @@ -45,18 +34,6 @@ under the License. <WarningLevel>4</WarningLevel> <PlatformTarget>AnyCPU</PlatformTarget> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <BuildPackage>true</BuildPackage> - <SignAssembly>true</SignAssembly> - <AssemblyOriginatorKeyFile>$(SolutionDir)\keyfile.snk</AssemblyOriginatorKeyFile> - <PlatformTarget>AnyCPU</PlatformTarget> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> <BuildPackage>true</BuildPackage> <SignAssembly>true</SignAssembly> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/492da34a/lang/cs/pom.xml ---------------------------------------------------------------------- diff --git a/lang/cs/pom.xml b/lang/cs/pom.xml index 9faa604..64896a8 100644 --- a/lang/cs/pom.xml +++ b/lang/cs/pom.xml @@ -29,6 +29,13 @@ under the License. <version>0.11.0-incubating-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>reef-bridge-java</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> <profiles> <profile> <id>DotNet</id> @@ -76,26 +83,6 @@ under the License. </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.7</version> - <executions> - <execution> - <id>copy-driver-files</id> - <phase>compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target name="copy driver dll file to class cpp project"> - <copy file="${project.basedir}/bin/x64/Release/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.dll" tofile="${basedir}\target\classes\Org.Apache.REEF.Driver.dll" /> - <copy file="${project.basedir}/bin/x64/Release/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.dll" tofile="../cpp/reef-bridge-clr/src/main/CSharp/CSharp/ClrHandler/externals/Org.Apache.REEF.Driver.dll" /> - </target> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </profile> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/492da34a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/LibLoader.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/LibLoader.java b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/LibLoader.java index 8f4132a..5789eed 100644 --- a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/LibLoader.java +++ b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/LibLoader.java @@ -59,10 +59,7 @@ public class LibLoader { try (final LoggingScope lb = loggingScopeFactory.loadLib()) { // Load the native library connecting C# and Java - this.loadMixedDLL(); - - // Load the CLR side - this.loadCLRBridgeDLL(); + this.loadBridgeDLL(); // Load all DLLs in local this.loadAllManagedDLLs(this.reefFileNames.getLocalFolder()); @@ -73,43 +70,66 @@ public class LibLoader { LOG.log(Level.INFO, "Done loading DLLs for Driver at time {0}." + new Date().toString()); } - private void loadMixedDLL() throws IOException { + /** + * Loads the Bridge DLL. First, it attempts to load from the reef/local folder. Second attempt is reef/global, last + * attempt is loading it from the JAR. + * + * @throws IOException If all attempts fail. + */ + private void loadBridgeDLL() throws IOException { try { - final String JavaClrBridgeDll = this.reefFileNames.getMixedDLLFile().getAbsolutePath(); - LOG.log(Level.INFO, "loadMixedDLL() -JavaClrBridge Dll: {0}.", JavaClrBridgeDll); - System.load(JavaClrBridgeDll); - } catch (final Throwable e) { - LOG.log(Level.WARNING, "loadMixedDLL() - Unable to load {0}, trying the JAR", this.reefFileNames.getMixedDLLFile().getAbsolutePath()); - final String tempLoadDir = System.getProperty(USER_DIR) + this.reefFileNames.getLoadDir(); - new File(tempLoadDir).mkdir(); - LOG.log(Level.INFO, "loadMixedDLL() - tempLoadDir created: {0} ", tempLoadDir); - final String bridgeMixedDLLName = this.reefFileNames.getBridgeMixedDLLName(); - LOG.log(Level.INFO, "loadMixedDLL() - BridgeMixedDLLName: {0}", bridgeMixedDLLName); - loadFromReefJar(bridgeMixedDLLName, false); + loadBridgeDLLFromLocal(); + } catch (final Throwable t) { + try { + loadBridgeDLLFromGlobal(); + } catch (final Throwable t2) { + loadBridgeDLLFromJAR(); + } } } - private void loadCLRBridgeDLL() throws IOException { - try { - File bridgeClrDLLFile = this.reefFileNames.getBridgeClrDLLFile(); - LOG.log(Level.INFO, "loadCLRBridgeDLL() - BridgeClrDLLFile: {0}.", bridgeClrDLLFile); - loadManagedDLL(bridgeClrDLLFile); - } catch (final Throwable t) { - LOG.log(Level.WARNING, "Unable to load {0}, trying the JAR.", this.reefFileNames.getBridgeClrDLLFile().getAbsolutePath()); - final String tempLoadDir = System.getProperty(USER_DIR) + this.reefFileNames.getLoadDir(); - new File(tempLoadDir).mkdir(); - LOG.log(Level.INFO, "loadCLRBridgeDLL() - tempLoadDir created: {0} ", tempLoadDir); - String bridgeClrDllName = this.reefFileNames.getBridgeClrDllName(); - LOG.log(Level.INFO, "loadCLRBridgeDLL() - BridgeClrDllName: {0}", bridgeClrDllName); - loadFromReefJar(bridgeClrDllName, true); - } + + /** + * Attempts to load the bridge DLL from the global folder. + */ + private void loadBridgeDLLFromGlobal() { + LOG.log(Level.INFO, "Attempting to load the bridge DLL from the global folder."); + loadBridgeDLLFromFile(reefFileNames.getBridgeDLLInGlobalFolderFile()); } /** - * Load assemblies at global folder + * Attempts to load the bridge DLL from the local folder. */ - private void loadDLLsInGlobal() { - loadAllManagedDLLs(this.reefFileNames.getGlobalFolder()); + private void loadBridgeDLLFromLocal() { + LOG.log(Level.INFO, "Attempting to load the bridge DLL from the local folder."); + loadBridgeDLLFromFile(reefFileNames.getBridgeDLLInLocalFolderFile()); + } + + /** + * Attempts to load the bridge DLL from the given file. + * + * @param bridgeDLLFile + */ + private static void loadBridgeDLLFromFile(final File bridgeDLLFile) { + LOG.log(Level.INFO, "Attempting to load the bridge DLL from {0}", bridgeDLLFile); + System.load(bridgeDLLFile.getAbsolutePath()); + LOG.log(Level.INFO, "Successfully loaded the bridge DLL from {0}", bridgeDLLFile); + } + + /** + * Attempts to load the bridge DLL from the JAR file. + * + * @throws IOException + * @deprecated We should use the files instead. + */ + @Deprecated + private void loadBridgeDLLFromJAR() throws IOException { + final String tempLoadDir = System.getProperty(USER_DIR) + this.reefFileNames.getLoadDir(); + new File(tempLoadDir).mkdir(); + LOG.log(Level.INFO, "loadBridgeDLL() - tempLoadDir created: {0} ", tempLoadDir); + final String bridgeMixedDLLName = this.reefFileNames.getBridgeDLLName(); + LOG.log(Level.INFO, "loadBridgeDLL() - BridgeMixedDLLName: {0}", bridgeMixedDLLName); + loadFromReefJar(bridgeMixedDLLName, false); } /** @@ -149,10 +169,13 @@ public class LibLoader { } /** - * Get file from jar file and copy it to temp dir and loads the library to memory + * Get file from jar file and copy it to temp dir and loads the library to memory. + * + * @deprecated This is replaced by loading it from the folders directly. */ + @Deprecated private void loadFromReefJar(String name, final boolean managed) throws IOException { - + LOG.log(Level.SEVERE, "Consider upgrading your REEF client. Loading DLLs from the JAR is deprecated."); if (!name.endsWith(".dll")) { name = name + DLL_EXTENSION; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/492da34a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/files/REEFFileNames.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/files/REEFFileNames.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/files/REEFFileNames.java index 1beb131..562ca7b 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/files/REEFFileNames.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/files/REEFFileNames.java @@ -31,9 +31,9 @@ public final class REEFFileNames { private static final String REEF_BASE_FOLDER = "reef"; private static final String GLOBAL_FOLDER = "global"; - static final String GLOBAL_FOLDER_PATH = REEF_BASE_FOLDER + '/' + GLOBAL_FOLDER; + private static final String GLOBAL_FOLDER_PATH = REEF_BASE_FOLDER + '/' + GLOBAL_FOLDER; private static final String LOCAL_FOLDER = "local"; - static final String LOCAL_FOLDER_PATH = REEF_BASE_FOLDER + '/' + LOCAL_FOLDER; + private static final String LOCAL_FOLDER_PATH = REEF_BASE_FOLDER + '/' + LOCAL_FOLDER; private static final String DRIVER_CONFIGURATION_NAME = "driver.conf"; private static final String DRIVER_CONFIGURATION_PATH = LOCAL_FOLDER_PATH + '/' + DRIVER_CONFIGURATION_NAME; @@ -47,10 +47,11 @@ public final class REEFFileNames { private static final String DRIVER_STDOUT = "driver.stdout"; private static final String EVALUATOR_STDERR = "evaluator.stderr"; private static final String EVALUATOR_STDOUT = "evaluator.stdout"; + @Deprecated private static final String REEF_DRIVER_APPDLL_DIR = "/ReefDriverAppDlls/"; + @Deprecated private static final String TMP_LOAD_DIR = "/reef/CLRLoadingDirectory"; - private static final String BRIDGE_CLR_DLL_NAME = "Org.Apache.REEF.Bridge.Clr.dll"; - private static final String BRIDGE_MIXED_DLL_NAME = "Org.Apache.REEF.Bridge.JavaClrBridge.dll"; + private static final String BRIDGE_DLL_NAME = "Org.Apache.REEF.Bridge.dll"; @Inject @@ -59,35 +60,26 @@ public final class REEFFileNames { /** - * @return the filename of the DLL containing the CLR side of the bridge. + * @return the filename of the CPP DLL for the bridge. */ - public String getBridgeClrDllName() { - return BRIDGE_CLR_DLL_NAME; + public String getBridgeDLLName() { + return BRIDGE_DLL_NAME; } /** - * reef/local/BRIDGE_CLR_DLL_NAME + * reef/local/BRIDGE_DLL_NAME * - * @return the File pointing to the DLL containing the CLR side of the bridge. + * @return the File pointing to the DLL containing the DLL for the bridge. */ - public File getBridgeClrDLLFile() { - return new File(getLocalFolder(), getBridgeClrDllName()); + public File getBridgeDLLInLocalFolderFile() { + return new File(getLocalFolder(), getBridgeDLLName()); } /** - * @return the filename of the CPP DLL for the bridge. - */ - public String getBridgeMixedDLLName() { - return BRIDGE_MIXED_DLL_NAME; - } - - /** - * reef/local/BRIDGE_MIXED_DLL_NAME - * - * @return the File pointing to the DLL containing the CPP DLL for the bridge. + * @return a File pointing to the Bridge DLL in the global folder. */ - public File getMixedDLLFile() { - return new File(getLocalFolder(), getBridgeMixedDLLName()); + public File getBridgeDLLInGlobalFolderFile() { + return new File(getGlobalFolder(), getBridgeDLLName()); } @@ -233,6 +225,7 @@ public final class REEFFileNames { /** * @return reef driver app dll directory */ + @Deprecated public String getReefDriverAppDllDir() { return REEF_DRIVER_APPDLL_DIR; } @@ -240,6 +233,7 @@ public final class REEFFileNames { /** * @return temp load directory */ + @Deprecated public String getLoadDir() { return TMP_LOAD_DIR; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/492da34a/lang/reef-bridge/.gitignore ---------------------------------------------------------------------- diff --git a/lang/reef-bridge/.gitignore b/lang/reef-bridge/.gitignore deleted file mode 100644 index 10c876b..0000000 --- a/lang/reef-bridge/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -dotnethello - - http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/492da34a/lang/reef-bridge/pom.xml ---------------------------------------------------------------------- diff --git a/lang/reef-bridge/pom.xml b/lang/reef-bridge/pom.xml deleted file mode 100644 index 9c13086..0000000 --- a/lang/reef-bridge/pom.xml +++ /dev/null @@ -1,139 +0,0 @@ -<?xml version="1.0"?> -<!-- -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. ---> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns="http://maven.apache.org/POM/4.0.0"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <artifactId>reef-bridge</artifactId> - <name>REEF Bridge</name> - <description>Bridge between JVM and CLR.</description> - - <parent> - <groupId>org.apache.reef</groupId> - <artifactId>reef-project</artifactId> - <version>0.11.0-incubating-SNAPSHOT</version> - <relativePath>../..</relativePath> - </parent> - - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>reef-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>reef-runtime-local</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>reef-runtime-yarn</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>reef-io</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>reef-checkpoint</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>reef-bridge-java</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>reef-bridge-clr</artifactId> - <version>${project.version}</version> - </dependency> - - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack-dependencies</id> - <phase>process-resources</phase> - <goals> - <goal>unpack-dependencies</goal> - </goals> - - <configuration> - <includeArtifactIds>reef-bridge-java,reef-bridge-clr</includeArtifactIds> - <outputDirectory> - ${project.build.directory}/classes/ReefDriverAppDlls - </outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>false</addClasspath> - <classpathPrefix>lib/</classpathPrefix> - <mainClass>org.apache.reef.javabridge.JavaBridge</mainClass> - </manifest> - </archive> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - </execution> - </executions> - <configuration> - <outputFile> - ${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar - </outputFile> - <filters> - <filter> - <artifact>*:*</artifact> - <excludes> - <exclude>yarn-default.xml</exclude> - <exclude>yarn-version-info.properties</exclude> - <exclude>core-default.xml</exclude> - <exclude>LICENSE</exclude> - <exclude>META-INF/*</exclude> - </excludes> - </filter> - </filters> - </configuration> - </plugin> - </plugins> - </build> -</project> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/492da34a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 615f875..f913080 100644 --- a/pom.xml +++ b/pom.xml @@ -247,6 +247,8 @@ under the License. <exclude>**/*.sln*</exclude> <exclude>**/*.vcxproj*</exclude> <exclude>**/*.csproj*</exclude> + <exclude>**/*.opensdf*</exclude> + <exclude>**/*.sdf*</exclude> <!-- The below are auto generated during the .Net build --> <exclude>**/bin/**</exclude> <exclude>**/obj/**</exclude> @@ -623,9 +625,7 @@ under the License. <modules> <module>lang/cs</module> <module>lang/java/reef-annotations</module> - <module>lang/java/reef-bridge-java</module> - <module>lang/cpp/reef-bridge-clr</module> - <module>lang/reef-bridge</module> + <module>lang/java/reef-bridge-java</module> <module>lang/java/reef-checkpoint</module> <module>lang/java/reef-common</module> <module>lang/java/reef-examples</module> @@ -667,18 +667,5 @@ under the License. </plugins> </build> </profile> - <profile> - <id>reef-bridge</id> - <activation> - <os> - <name>Windows</name> - <family>Windows</family> - </os> - </activation> - <modules> - <module>lang/reef-bridge</module> - </modules> - - </profile> </profiles> </project>
