Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CONF
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UvA
CONF
Commits
70d8ad12
Commit
70d8ad12
authored
Mar 11, 2017
by
Spiros Koulouzis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed unused prop file
parent
b68c5ae0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
6 deletions
+25
-6
pom.xml
drip-provisioner/pom.xml
+20
-0
Consumer.java
.../main/java/nl/uva/sne/drip/drip/provisioner/Consumer.java
+5
-6
No files found.
drip-provisioner/pom.xml
View file @
70d8ad12
...
@@ -47,4 +47,24 @@
...
@@ -47,4 +47,24 @@
<type>
jar
</type>
<type>
jar
</type>
</dependency>
</dependency>
</dependencies>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>
maven-assembly-plugin
</artifactId>
<configuration>
<archive>
<manifest>
<mainClass>
nl.uva.sne.drip.drip.provisioner.RPCServer
</mainClass>
</manifest>
</archive>
<descriptorRefs>
<descriptorRef>
jar-with-dependencies
</descriptorRef>
</descriptorRefs>
</configuration>
</plugin>
</plugins>
</build>
</project>
</project>
\ No newline at end of file
drip-provisioner/src/main/java/nl/uva/sne/drip/drip/provisioner/Consumer.java
View file @
70d8ad12
...
@@ -27,7 +27,6 @@ import java.io.FileOutputStream;
...
@@ -27,7 +27,6 @@ import java.io.FileOutputStream;
import
java.io.FileReader
;
import
java.io.FileReader
;
import
java.io.FileWriter
;
import
java.io.FileWriter
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.io.PrintWriter
;
import
java.io.PrintWriter
;
import
java.nio.file.Files
;
import
java.nio.file.Files
;
import
java.nio.file.Paths
;
import
java.nio.file.Paths
;
...
@@ -54,7 +53,7 @@ import org.json.JSONObject;
...
@@ -54,7 +53,7 @@ import org.json.JSONObject;
public
class
Consumer
extends
DefaultConsumer
{
public
class
Consumer
extends
DefaultConsumer
{
private
final
Channel
channel
;
private
final
Channel
channel
;
private
final
String
propertiesPath
=
"etc/consumer.properties"
;
//
private final String propertiesPath = "etc/consumer.properties";
Map
<
String
,
String
>
em
=
new
HashMap
<>();
Map
<
String
,
String
>
em
=
new
HashMap
<>();
...
@@ -68,10 +67,10 @@ public class Consumer extends DefaultConsumer {
...
@@ -68,10 +67,10 @@ public class Consumer extends DefaultConsumer {
public
Consumer
(
Channel
channel
)
throws
IOException
{
public
Consumer
(
Channel
channel
)
throws
IOException
{
super
(
channel
);
super
(
channel
);
this
.
channel
=
channel
;
this
.
channel
=
channel
;
Properties
prop
=
new
Properties
();
//
Properties prop = new Properties();
try
(
InputStream
in
=
new
FileInputStream
(
propertiesPath
))
{
//
try (InputStream in = new FileInputStream(propertiesPath)) {
prop
.
load
(
in
);
//
prop.load(in);
}
//
}
// jarFilePath = prop.getProperty("jar.file.path", "/root/SWITCH/bin/ProvisioningCore.jar");
// jarFilePath = prop.getProperty("jar.file.path", "/root/SWITCH/bin/ProvisioningCore.jar");
// File jarFile = new File(jarFilePath);
// File jarFile = new File(jarFilePath);
// if (!jarFile.exists()) {
// if (!jarFile.exists()) {
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment