removed WLS scripting and fixed web-is to avoid conflict with web
diff --git a/jpa/employee/employee.model/.project b/jpa/employee/employee.model/.project
index 5a922d3..b31ddd6 100644
--- a/jpa/employee/employee.model/.project
+++ b/jpa/employee/employee.model/.project
@@ -37,6 +37,5 @@
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.python.pydev.pythonNature</nature>
</natures>
</projectDescription>
diff --git a/jpa/employee/employee.model/src/config/weblogic/config.properties b/jpa/employee/employee.model/src/config/weblogic/config.properties
deleted file mode 100644
index b90e907..0000000
--- a/jpa/employee/employee.model/src/config/weblogic/config.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# WebLogic 12.1.2
-domain.name=7001_Domain
-admin.url=t3://localhost:7001
-admin.userName=weblogic
-admin.password=Password1
-
-# Data source to be used by example
-datasource.name=EmployeeDS
-datasource.jndiname=java:global/employeeDS
-datasource.database.name=employee
-datasource.target=AdminServer
-datasource.driver.class=com.mysql.jdbc.Driver
-datasource.url=jdbc:mysql://localhost:3306/employee
-datasource.username=root
-datasource.password=password
-datasource.test.query=SQL SELECT * FROM DUAL
-
diff --git a/jpa/employee/employee.model/src/config/weblogic/createDataSource.cmd b/jpa/employee/employee.model/src/config/weblogic/createDataSource.cmd
deleted file mode 100644
index 476e6aa..0000000
--- a/jpa/employee/employee.model/src/config/weblogic/createDataSource.cmd
+++ /dev/null
@@ -1,19 +0,0 @@
-@echo off
-
-set LOC=%1%
-
-if /I "%LOC%"=="" (goto error)
-goto start
-
-:start
-call "%LOC%\server\bin\setWLSEnv.cmd"
-call "%JAVA_HOME%\bin\java" weblogic.WLST createDataSource.py"
-
-goto end
-
-:error
-echo "No arguments supplied: Must provide directory where WLS is installed"
-echo " USAGE: createDataSource.cmd C:\Oracle\Middleware\wlserver_12.1"
-
-:end
-@endlocal
\ No newline at end of file
diff --git a/jpa/employee/employee.model/src/config/weblogic/createDataSource.py b/jpa/employee/employee.model/src/config/weblogic/createDataSource.py
deleted file mode 100644
index 70cec07..0000000
--- a/jpa/employee/employee.model/src/config/weblogic/createDataSource.py
+++ /dev/null
@@ -1,71 +0,0 @@
-from java.io import FileInputStream
-
-propInputStream = FileInputStream("config.properties")
-configProps = Properties()
-configProps.load(propInputStream)
-
-domainName=configProps.get("domain.name")
-adminURL=configProps.get("admin.url")
-adminUserName=configProps.get("admin.userName")
-adminPassword=configProps.get("admin.password")
-
-dsName=configProps.get("datasource.name")
-dsDatabaseName=configProps.get("datasource.database.name")
-datasourceTarget=configProps.get("datasource.target")
-dsJNDIName=configProps.get("datasource.jndiname")
-dsDriverName=configProps.get("datasource.driver.class")
-dsURL=configProps.get("datasource.url")
-dsUserName=configProps.get("datasource.username")
-dsPassword=configProps.get("datasource.password")
-dsTestQuery=configProps.get("datasource.test.query")
-
-connect(adminUserName, adminPassword, adminURL)
-edit()
-startEdit()
-cd('/')
-
-### Checking for the server
-try:
- cd('/JDBCSystemResources/' + dsName + '/JDBCResource/' + dsName)
- print '===> /JDBCSystemResources/' +dsName+'/JDBCResource/ already exists'
- print '===> No action was performed'
- cancelEdit('y')
- exit()
-except:
- pass
-
-cd('/')
-cmo.createJDBCSystemResource(dsName)
-cd('/JDBCSystemResources/' + dsName + '/JDBCResource/' + dsName)
-cmo.setName(dsName)
-
-cd('/JDBCSystemResources/' + dsName + '/JDBCResource/' + dsName + '/JDBCDataSourceParams/' + dsName )
-set('JNDINames',jarray.array([String( dsJNDIName )], String))
-
-cd('/JDBCSystemResources/' + dsName + '/JDBCResource/' + dsName + '/JDBCDriverParams/' + dsName )
-cmo.setUrl(dsURL)
-cmo.setDriverName( dsDriverName )
-cmo.setPassword(dsPassword)
-
-cd('/JDBCSystemResources/' + dsName + '/JDBCResource/' + dsName + '/JDBCConnectionPoolParams/' + dsName )
-cmo.setTestTableName(dsTestQuery)
-cd('/JDBCSystemResources/' + dsName + '/JDBCResource/' + dsName + '/JDBCDriverParams/' + dsName + '/Properties/' + dsName )
-cmo.createProperty('user')
-
-cd('/JDBCSystemResources/' + dsName + '/JDBCResource/' + dsName + '/JDBCDriverParams/' + dsName + '/Properties/' + dsName + '/Properties/user')
-cmo.setValue(dsUserName)
-
-cd('/JDBCSystemResources/' + dsName + '/JDBCResource/' + dsName + '/JDBCDriverParams/' + dsName + '/Properties/' + dsName )
-cmo.createProperty('databaseName')
-
-cd('/JDBCSystemResources/' + dsName + '/JDBCResource/' + dsName + '/JDBCDriverParams/' + dsName + '/Properties/' + dsName + '/Properties/databaseName')
-cmo.setValue(dsDatabaseName)
-
-cd('/JDBCSystemResources/' + dsName + '/JDBCResource/' + dsName + '/JDBCDataSourceParams/' + dsName )
-cmo.setGlobalTransactionsProtocol('OnePhaseCommit')
-
-cd('/SystemResources/' + dsName )
-set('Targets',jarray.array([ObjectName('com.bea:Name=' + datasourceTarget + ',Type=Server')], ObjectName))
-
-save()
-activate()
\ No newline at end of file
diff --git a/jpa/employee/employee.model/src/config/weblogic/createDataSource.sh b/jpa/employee/employee.model/src/config/weblogic/createDataSource.sh
deleted file mode 100755
index 4650f31..0000000
--- a/jpa/employee/employee.model/src/config/weblogic/createDataSource.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-if [ $# -eq 0 ]
- then
- echo "No arguments supplied: Must provide directory where WLS 12.1.2 is installed"
- echo " USAGE: ./createDataSource.sh ~/java/wls_1212"
- exit
-fi
-
-pushd $1/wlserver/server/bin
-
-. ./setWLSEnv.sh
-
-popd
-
-java weblogic.WLST createDataSource.py
diff --git a/jpa/employee/employee.web-js/pom.xml b/jpa/employee/employee.web-js/pom.xml
index fb6a911..a8197ae 100644
--- a/jpa/employee/employee.web-js/pom.xml
+++ b/jpa/employee/employee.web-js/pom.xml
@@ -14,12 +14,10 @@
<name>Employee Web JavaScript App</name>
<dependencies>
- <!-- EclipseLink JPA-RS Web Fragment -->
<dependency>
<groupId>${eclipselink.groupid}</groupId>
<artifactId>org.eclipse.persistence.jpars</artifactId>
<version>${eclipselink.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
@@ -28,12 +26,9 @@
<version>2.4.2-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
- <version>6.0</version>
- <scope>provided</scope>
- </dependency>
-
</dependencies>
+
+ <build>
+ <finalName>employee.web-js</finalName>
+ </build>
</project>
