summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Dennis <jdennis@redhat.com>2014-11-02 11:43:35 -0500
committerJohn Dennis <jdennis@redhat.com>2014-11-02 11:43:35 -0500
commit7e5e3903a69671eb4f9047f1b104e36b27c972c2 (patch)
tree0ba13bb7af02d3c6c8d2b55290250244aacffe98
parent6dd871727c262f5fcc58853e2c1f7b4081cc3e32 (diff)
downloadfederated-mapping-7e5e3903a69671eb4f9047f1b104e36b27c972c2.zip
federated-mapping-7e5e3903a69671eb4f9047f1b104e36b27c972c2.tar.gz
federated-mapping-7e5e3903a69671eb4f9047f1b104e36b27c972c2.tar.xz
remove or replace site specific strings
-rw-r--r--java/src/main/java/com/redhat/IdPMapping/IdpJson.java2
-rw-r--r--java/src/main/java/com/redhat/IdPMapping/InvalidRuleException.java2
-rw-r--r--java/src/main/java/com/redhat/IdPMapping/InvalidTypeException.java2
-rw-r--r--java/src/main/java/com/redhat/IdPMapping/InvalidValueException.java2
-rw-r--r--java/src/main/java/com/redhat/IdPMapping/RuleProcessor.java6
-rw-r--r--java/src/main/java/com/redhat/IdPMapping/StatementErrorException.java2
-rw-r--r--java/src/main/java/com/redhat/IdPMapping/Token.java2
-rw-r--r--java/src/main/java/com/redhat/IdPMapping/UndefinedValueException.java2
-rw-r--r--java/src/main/java/com/redhat/app/MappingApp.java2
-rwxr-xr-xpython/mapping_app.py4
10 files changed, 13 insertions, 13 deletions
diff --git a/java/src/main/java/com/redhat/IdPMapping/IdpJson.java b/java/src/main/java/com/redhat/IdPMapping/IdpJson.java
index 7b95ea9..f88c349 100644
--- a/java/src/main/java/com/redhat/IdPMapping/IdpJson.java
+++ b/java/src/main/java/com/redhat/IdPMapping/IdpJson.java
@@ -6,7 +6,7 @@
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.aaa.idpmapping;
+package com.redhat.idpmapping;
import java.io.BufferedReader;
diff --git a/java/src/main/java/com/redhat/IdPMapping/InvalidRuleException.java b/java/src/main/java/com/redhat/IdPMapping/InvalidRuleException.java
index 61bf0c2..50acbeb 100644
--- a/java/src/main/java/com/redhat/IdPMapping/InvalidRuleException.java
+++ b/java/src/main/java/com/redhat/IdPMapping/InvalidRuleException.java
@@ -6,7 +6,7 @@
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.aaa.idpmapping;
+package com.redhat.idpmapping;
/**
* Exception thrown when a mapping rule is improperly defined.
diff --git a/java/src/main/java/com/redhat/IdPMapping/InvalidTypeException.java b/java/src/main/java/com/redhat/IdPMapping/InvalidTypeException.java
index aea0416..fa64d6c 100644
--- a/java/src/main/java/com/redhat/IdPMapping/InvalidTypeException.java
+++ b/java/src/main/java/com/redhat/IdPMapping/InvalidTypeException.java
@@ -6,7 +6,7 @@
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.aaa.idpmapping;
+package com.redhat.idpmapping;
/**
* Exception thrown when the type of a value is incorrect for a given
diff --git a/java/src/main/java/com/redhat/IdPMapping/InvalidValueException.java b/java/src/main/java/com/redhat/IdPMapping/InvalidValueException.java
index 1524b4f..2d0f26c 100644
--- a/java/src/main/java/com/redhat/IdPMapping/InvalidValueException.java
+++ b/java/src/main/java/com/redhat/IdPMapping/InvalidValueException.java
@@ -6,7 +6,7 @@
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.aaa.idpmapping;
+package com.redhat.idpmapping;
/**
* Exception thrown when a value cannot be used in a given context.
diff --git a/java/src/main/java/com/redhat/IdPMapping/RuleProcessor.java b/java/src/main/java/com/redhat/IdPMapping/RuleProcessor.java
index ebf4e0a..33dbd58 100644
--- a/java/src/main/java/com/redhat/IdPMapping/RuleProcessor.java
+++ b/java/src/main/java/com/redhat/IdPMapping/RuleProcessor.java
@@ -6,7 +6,7 @@
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.aaa.idpmapping;
+package com.redhat.idpmapping;
import java.io.IOException;
@@ -26,8 +26,8 @@ import java.util.regex.Pattern;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.opendaylight.aaa.idpmapping.IdpJson;
-import org.opendaylight.aaa.idpmapping.Token;
+import com.redhat.idpmapping.IdpJson;
+import com.redhat.idpmapping.Token;
diff --git a/java/src/main/java/com/redhat/IdPMapping/StatementErrorException.java b/java/src/main/java/com/redhat/IdPMapping/StatementErrorException.java
index 4d17f64..3d5a2f8 100644
--- a/java/src/main/java/com/redhat/IdPMapping/StatementErrorException.java
+++ b/java/src/main/java/com/redhat/IdPMapping/StatementErrorException.java
@@ -6,7 +6,7 @@
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.aaa.idpmapping;
+package com.redhat.idpmapping;
/**
* Exception thrown when a mapping rule statement fails.
diff --git a/java/src/main/java/com/redhat/IdPMapping/Token.java b/java/src/main/java/com/redhat/IdPMapping/Token.java
index 9b835cb..0a51b9f 100644
--- a/java/src/main/java/com/redhat/IdPMapping/Token.java
+++ b/java/src/main/java/com/redhat/IdPMapping/Token.java
@@ -6,7 +6,7 @@
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.aaa.idpmapping;
+package com.redhat.idpmapping;
diff --git a/java/src/main/java/com/redhat/IdPMapping/UndefinedValueException.java b/java/src/main/java/com/redhat/IdPMapping/UndefinedValueException.java
index d3e429c..65deb9c 100644
--- a/java/src/main/java/com/redhat/IdPMapping/UndefinedValueException.java
+++ b/java/src/main/java/com/redhat/IdPMapping/UndefinedValueException.java
@@ -6,7 +6,7 @@
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.aaa.idpmapping;
+package com.redhat.idpmapping;
/**
* Exception thrown when a statement references an undefined value.
diff --git a/java/src/main/java/com/redhat/app/MappingApp.java b/java/src/main/java/com/redhat/app/MappingApp.java
index 511a823..500a7c0 100644
--- a/java/src/main/java/com/redhat/app/MappingApp.java
+++ b/java/src/main/java/com/redhat/app/MappingApp.java
@@ -29,7 +29,7 @@ class MappingApp {
log.info("Federated Mapping");
String rulesFilename = args[0];
- String assertionFilename = "/home/jdennis/src/misc/federation_mapping/assertion-01.json";
+ String assertionFilename = "assertion-01.json";
String assertionJson;
Map<String, Object> mapped;
IdpJson json = new IdpJson();
diff --git a/python/mapping_app.py b/python/mapping_app.py
index c590061..1d1950e 100755
--- a/python/mapping_app.py
+++ b/python/mapping_app.py
@@ -9,8 +9,8 @@ import traceback
LOG = logging.getLogger()
logging.basicConfig(level=logging.INFO, format='%(message)s')
-rule_filename = '/home/jdennis/src/misc/federation_mapping/rules-python-01.json'
-assertion_filename = '/home/jdennis/src/misc/federation_mapping/assertion-01.json'
+rule_filename = 'rules-python-01.json'
+assertion_filename = 'assertion-01.json'
def assertion_from_file(filename):
with open(filename) as stream: