diff --git a/opensocial/build_orng.xml b/opensocial/build_orng.xml
new file mode 100644
index 000000000..c8a83ab2d
--- /dev/null
+++ b/opensocial/build_orng.xml
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
+
+
+
+
+all - Runs "clean", then "deploy".
+clean - Delete all artifacts so the next build will be from scratch.
+deploy - Configure the application and deploy directly into the Tomcat webapps directory.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/opensocial/shindig.orng.properties b/opensocial/shindig.orng.properties.template
similarity index 95%
rename from opensocial/shindig.orng.properties
rename to opensocial/shindig.orng.properties.template
index 366c26c5e..7d8d40ca5 100644
--- a/opensocial/shindig.orng.properties
+++ b/opensocial/shindig.orng.properties.template
@@ -157,7 +157,7 @@ shindig.json-rpc.result-field=result
shindig.accelerate.remapInternalServerError=true
shindig.proxy.remapInternalServerError=true
-shindig.signing.key-file=/shindig/openssl/oauthkey.pem
+shindig.signing.key-file=@TOKEN_KEY_FILE@
shindig.signing.key-name=
####################################################################################
@@ -172,10 +172,10 @@ orng.system = VIVO
# orng.dbDriver is likely com.microsoft.sqlserver.jdbc.SQLServerDriver for Profiles and com.mysql.jdbc.Driver for VIVO
#orng.dbDriver = com.microsoft.sqlserver.jdbc.SQLServerDriver
-orng.dbDriver = com.mysql.jdbc.Driver
-orng.dbURL = jdbc:mysql://localhost/vitrodb
-orng.dbUser = vitrodb
-orng.dbPassword = vitrodb
+orng.dbDriver = @DATA_SOURCE_DRIVER@
+orng.dbURL = @DATA_SOURCE_URL@
+orng.dbUser = @DATA_SOURCE_USERNAME@
+orng.dbPassword = @DATA_SOURCE_PASSWORD@
orng.tokenservice.port = 8777
# orng.RDFConverter = elda | babel
orng.RDFConverter = elda
diff --git a/webapp/build.xml b/webapp/build.xml
index 429c87998..85c300dde 100644
--- a/webapp/build.xml
+++ b/webapp/build.xml
@@ -74,6 +74,7 @@
all - Runs "clean", then "deploy".
clean - Delete all artifacts so the next build will be from scratch.
compile - Compile the Java source files.
+orng - Configure and deploy the ORNG Shindig application.
test - Compile and run the JUnit tests.
war - Create a WAR file to be deployed in a servlet container.
deploy - Deploy the application directly into the Tomcat webapps directory.
@@ -115,15 +116,15 @@ deploy - Deploy the application directly into the Tomcat webapps directory.
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -356,6 +357,13 @@ deploy - Deploy the application directly into the Tomcat webapps directory.
+
+
+
+
+