summaryrefslogtreecommitdiffstats
path: root/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main')
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/DASQueryProcessor.java470
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/SillyDateStringConverter.java75
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/StringToLongConverter.java37
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/util/XmlUtil.java58
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/web/CommandServlet.java160
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/web/ServiceProcessor.java24
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/AjaxDBConfig.xml52
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/CustomerConfigWithConverter.xml34
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/CustomerConfigWithIDConverter.xml33
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/DasConfig.xml45
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/META-INF/LICENSE353
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/META-INF/NOTICE32
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/META-INF/README35
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/log4j.properties36
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/META-INF/context.xml22
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/WEB-INF/tld/c.tld563
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/WEB-INF/tld/fmt.tld671
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/WEB-INF/web.xml46
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/html/DASWebSampleFrame.html27
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/html/blank.html25
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/js/ajax.js188
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/js/dasmenu.js112
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/DASMenu.jsp63
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/converter.jsp117
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/default.css35
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/indexAdhoc.jsp87
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/indexCommand.jsp85
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/main.css120
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/occ.jsp77
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/rss.jsp78
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/xsl/company.xsl44
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/xsl/companyDepartment.xsl65
-rw-r--r--das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/xsl/customer.xsl49
33 files changed, 0 insertions, 3918 deletions
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/DASQueryProcessor.java b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/DASQueryProcessor.java
deleted file mode 100644
index 3d14c74786..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/DASQueryProcessor.java
+++ /dev/null
@@ -1,470 +0,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.
- */
-
-package org.apache.tuscany.samples.das;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.ObjectOutputStream;
-import java.lang.reflect.Method;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.util.Random;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import org.apache.tuscany.das.rdb.Command;
-import org.apache.tuscany.das.rdb.DAS;
-import org.apache.tuscany.das.rdb.exception.OptimisticConcurrencyException;
-import org.apache.tuscany.samples.das.util.XmlUtil;
-import org.apache.tuscany.samples.web.ServiceProcessor;
-
-import commonj.sdo.DataGraph;
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.XMLHelper;
-
-public class DASQueryProcessor extends ServiceProcessor{
- private DAS das = null;
- private Command read = null;
- private Random generator = new Random();
- private String configFile = null;
-
- private static DateFormat myformat = new SimpleDateFormat("yyyy.MM.dd");
- private static Date kbday;
- private static Date tbday;
-
- public String execute(String queryOrcommand, String configFile) throws Exception{
- String status = null;
- this.configFile = configFile;
-
- try{
- Properties props = validate(queryOrcommand);
-
- if(props != null){
- status = this.getResult((String)props.values().iterator().next(),
- (String)props.keys().nextElement());
- }
-
- if(queryOrcommand.startsWith("occ:")){
- status = this.getOcc();
- }
-
- if(queryOrcommand.startsWith("converter:")){
- status = this.getConverter(queryOrcommand.substring(10));
- }
-
- if(queryOrcommand.startsWith("rss:")){
- status = this.getRss(queryOrcommand.substring(4));
- }
- }catch(Exception e){
- das.releaseResources();
- e.printStackTrace();
- throw e;
- }
- das.releaseResources();
- return status ;
- }
-
- private Properties validate(String queryOrcommand) throws Exception{
- if(queryOrcommand == null){
- throw new Exception("Invalid Command URL -> COMMAND is NULL");
- }
-
- if(queryOrcommand.startsWith("query:")){
- String qry = queryOrcommand.substring(6);
- if(qry == null || qry.trim().length() == 0){
- throw new Exception("Invalid Command URL -> COMMAND is NULL");
- }
- else{
- Properties props = new Properties();
- props.put("query", qry);
- return props;
- }
- }
-
- if(queryOrcommand.startsWith("command:")){
- String cmd = queryOrcommand.substring(8);
- if(cmd == null || cmd.trim().length() == 0){
- throw new Exception("Invalid Command URL -> COMMAND is NULL");
- }
- else{
- Properties props = new Properties();
- props.put("command", cmd);
- return props;
- }
- }
-
-
- return null;
- }
-
- /*For any query starting with query: or command: */
- private String getResult(String qry, String qryOrCommand) throws Exception {
- getDAS();
- DataObject root = runCommand(qry, qryOrCommand);
- //BOOK, COMPANY, DEPARTMENT, CUSTOMER
- Vector elemNames = new Vector();
- if(root.getList("BOOK") != null && root.getList("BOOK").size() >0){
- elemNames.add("BOOK");
- }
- if(root.getList("COMPANY") != null && root.getList("COMPANY").size() >0){
- elemNames.add("COMPANY");
- }
- if(root.getList("DEPARTMENT") != null && root.getList("DEPARTMENT").size() >0){
- elemNames.add("DEPARTMENT");
- }
- if(root.getList("CUSTOMER") != null && root.getList("CUSTOMER").size() >0){
- elemNames.add("CUSTOMER");
- }
-
- return formatResult(root, elemNames);
-
- }
-
- /* Get DAS config */
- private InputStream getConfig(String fileName) {
- return getClass().getClassLoader().getResourceAsStream(fileName);
- }
-
- /* Instantiate DAS*/
- private void getDAS(){
- das = DAS.FACTORY.createDAS(getConfig(configFile));
- }
-
- /*For any query starting with query: or command: */
- private DataObject runCommand(String qry, String qryOrCommand)throws Exception{
- DataObject root = null;
-
- //adhoc queries
- if(qryOrCommand.startsWith("query")){//query can come single or batch, when batch, it will be {}{}
- if(!qry.startsWith("{")){
- read = das.createCommand(qry);
- root = read.executeQuery();
- }
- else{
- Vector batch = formQueries(qry);//separate {}{} in different queries
-
- if(batch != null){
- for(int i=0; i<batch.size(); i++){
- String curQry = (String) batch.get(i);
- if(curQry.substring(0, 6).equalsIgnoreCase("select")){
- read = das.createCommand(curQry);
- root = read.executeQuery();
- }
- else{
- read = das.createCommand(curQry);
- read.execute();
- }
- }
- }
- }
- }
-
- //DAS config commands
- if(qryOrCommand.startsWith("command")){
- String methodName = "get"+qry; //some convention to form method name instead of lenghtening code
-
- Method commandMethod = this.getClass().getMethod(methodName, new Class[]{String.class});
- root = (DataObject)commandMethod.invoke(this, new Object[] {qry});
- }
- return root;
- }
-
- /* Separate batch of queries into vector of queries - for adhoc*/
- private Vector formQueries(String qry){
- Vector batch = new Vector();
- StringTokenizer strTok = new StringTokenizer(qry, "{");
- while(strTok.hasMoreTokens()){
- String curQry = strTok.nextToken();
- curQry = curQry.substring(0, curQry.length()-1);
- batch.add(curQry);
- }
- return batch;
- }
-
- public static String formatResult(DataObject root, Vector elementNames){
- String xmlStr = "";
- XMLHelper helper = XMLHelper.INSTANCE;
- for(int elemCount=0; elemCount<elementNames.size(); elemCount++){
- String curElemName = (String)elementNames.get(elemCount);
- List elemList = root.getList(curElemName);
- for(int i=0; i<elemList.size(); i++){
- DataObject curComp = (DataObject)elemList.get(i);
- xmlStr = xmlStr+helper.save(curComp,null, curElemName);
-
- //System.out.println("xmlStr:"+xmlStr);
-
- //format xmlstr
- while(true){
- String rmvStr = "<?xml version=\"1.0\" encoding=\"ASCII\"?>";
- int idx = xmlStr.indexOf("<?xml version", 0);
- if(idx == -1) break;
- xmlStr = xmlStr.substring(0, idx)+xmlStr.substring(idx+rmvStr.length());
-
- rmvStr = "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"";
- idx = xmlStr.indexOf("xmlns:xsi=", 0);
- if(idx == -1) break;
- xmlStr = xmlStr.substring(0, idx)+xmlStr.substring(idx+rmvStr.length());
-
- rmvStr = "xmlns:das=\"http:///org.apache.tuscany.das.rdb/das\"";
- idx = xmlStr.indexOf("xmlns:das=", 0);
- if(idx == -1) break;
- xmlStr = xmlStr.substring(0, idx)+xmlStr.substring(idx+rmvStr.length());
-
- //System.out.println("xmlStr:"+xmlStr);
- }
-
- while(true){
- String rmvStr = "xsi:type=\"";
- int idx = xmlStr.indexOf(rmvStr, 0);
- if(idx == -1) break;
- int idxEnd = xmlStr.indexOf("\"", idx+rmvStr.length());
- xmlStr = xmlStr.substring(0, idx)+xmlStr.substring(idxEnd+1);
-
- //System.out.println("xmlStr:"+xmlStr);
- }
- }
- }
-
- String add0Str = "<?xml version='1.0' encoding='ISO-8859-1' ?>\n";
- String add1Str = "<root xmlns:das='http://org.apache.tuscany.das.rdb/config.xsd' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>\n";
- String add2Str = "<das:DataGraphRoot>";
- String addEndStr = "</das:DataGraphRoot> </root>";
-
- xmlStr = add0Str+add1Str+add2Str+xmlStr+"\n"+addEndStr;
- return xmlStr;
- }
-
- //below has improper serialization due to SDO bugs
- /*From DataGraph get contents related to element <das:DataGraphRoot>*/
- /*private String xmlizeContent(DataGraph graph) throws Exception{
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- ObjectOutputStream oos = new ObjectOutputStream(out);
- oos.writeObject(graph);
- oos.flush();
- out.flush();
- //oos.close();
- out.close();
-
- //there are UTF-8 chars which are not ISO-8859-1 ones and xsl transformation does not happen due to that
- //so filter unwanted.
- byte[] graphBytes = out.toByteArray();
- InputStreamReader graphBytesFilter = new InputStreamReader(new ByteArrayInputStream(graphBytes),"ISO-8859-1");
- char[] graphChars = new char[graphBytes.length];
- int curChar = -1;
- int j=0;
- while((curChar = graphBytesFilter.read()) != -1){
- graphChars[j] = (char)curChar;
- j++;
- }
-
- String finalStr = new String(graphChars);
-
- //remove any junk before first <
- finalStr = finalStr.substring(finalStr.indexOf("<"), finalStr.indexOf("</sdo:datagraph>")+16);
- String xmlSerializationContent = filterJunk(finalStr);//further remove extra characters appearing
- System.out.println("xmlSerializationContent:"+xmlSerializationContent);
- String xmlContent = XmlUtil.getXmlContents(xmlSerializationContent, "<das:DataGraphRoot>", "</das:DataGraphRoot>");
- System.out.println("xmlContent:"+xmlContent);
- return xmlContent;
- }
-
- //for some reason control chars are appearing, need to filter those
- //this is ugly solution, need to know why from SDO DataGraph these
- //chars are coming in the first place.
- private String filterJunk(String inStr){
- char[] myCharArr = inStr.toCharArray();
- StringBuffer strBuf = new StringBuffer();
-
- for(int i=0; i<myCharArr.length; i++){
- if((myCharArr[i]>=33 && myCharArr[i]<=125) ||
- Character.isWhitespace(myCharArr[i])){
- strBuf.append(myCharArr[i]);
- }
- }
- return strBuf.toString();
- }*/
-
- /* Start CRUD example */
- public DataObject getAllCompanies(String qry) {
- read = das.getCommand(qry);
- DataObject root = read.executeQuery();
- return root;
- }
-
- public DataObject getAllCompaniesAndDepartments(String qry) {
- read = das.getCommand(qry);
- DataObject root = read.executeQuery();
- return root;
- }
-
- public DataObject getAddDepartmentToFirstCompany(String qry) {
- Command read = das.getCommand("AllCompaniesAndDepartments");
- DataObject root = read.executeQuery();
- DataObject firstCompany = root.getDataObject("COMPANY[1]");
-
- DataObject newDepartment = root.createDataObject("DEPARTMENT");
- newDepartment.setString("NAME", "Default Name");
- List deptList = firstCompany.getList("departments");
-
- deptList.add(newDepartment);
- das.applyChanges(root);
-
- root = read.executeQuery();
- return root;
- }
-
- public DataObject getDeleteDepartmentFromFirstCompany(String qry) {
- Command read = das.getCommand("AllCompaniesAndDepartments");
- DataObject root = read.executeQuery();
- DataObject firstCompany = root.getDataObject("COMPANY[1]");
-
- List departments = firstCompany.getList("departments");
- DataObject departmentToDelete = (DataObject)departments.get(departments.size()-1);
- departmentToDelete.delete();
- das.applyChanges(root);
- root = read.executeQuery();
- return root;
- }
-
- public DataObject getUpdateCompanyDepartmentNames(String qry) {
- Command read = das.getCommand("AllCompaniesAndDepartments");
- DataObject root = read.executeQuery();
- DataObject firstCompany = root.getDataObject("COMPANY[1]");
-
- Iterator i = firstCompany.getList("departments").iterator();
-
- DataObject department;
- while (i.hasNext()) {
- department = (DataObject) i.next();
- String newName = getRandomDepartmentName();
- department.setString("NAME", newName);
- break;
- }
- das.applyChanges(root);
-
- root = read.executeQuery();
- return root;
- }
-
- /* @return random new department name */
- private String getRandomDepartmentName() {
- int number = generator.nextInt(1000) + 1;
- return "Dept-" + number;
- }
- /*End CRUD example */
-
- /*Start OCC example */
- public String getOcc() throws Exception{
- getDAS();
- Command select = das.createCommand("Select * from BOOK where BOOK_ID = 1");
- DataObject root = select.executeQuery();
- // Explicitly update the DB to force a collision
- Command update = das.createCommand("update BOOK set NAME = 'Puss in Hat' where BOOK_ID = 1");
- update.execute();
- DataObject book = root.getDataObject("BOOK[1]");
-
- // Modify customer
- book.set("NAME", "Puss in Bat");
-
- // Build apply changes command
- try {
- das.applyChanges(root);
- } catch (OptimisticConcurrencyException ex) {
- if (!ex.getMessage().equals("An update collision occurred")) {
- throw ex;
- }
- else{
- return ex.getMessage();
- }
- }
- return "Success";
- }
- /* End OCC example */
-
- /* Start Result Set Shape example*/
- public String getRss(String stmt) throws Exception{
- getDAS();
- read = das.getCommand(stmt);
- //Read
- DataObject root = read.executeQuery();
- Vector elemNames = new Vector();
- elemNames.add("CUSTOMER");
- return formatResult(root, elemNames);
- }
- /* End Result Set Shape example*/
-
- /*Converter example start*/
- static {
- try {
- kbday = myformat.parse("1957.09.27");
- tbday = myformat.parse("1966.12.20");
- } catch (ParseException e) {
- throw new RuntimeException(e);
- }
- }
-
- public String getConverter(String stmt) throws Exception{
- getDAS();
- read = das.getCommand("testArbitraryConverter");
- //Read
- DataObject root = read.executeQuery();
-
- if(stmt.equals("stmt0")){//Select * from CUSTOMER where ID = 1;
- Vector elemNames = new Vector();
- elemNames.add("CUSTOMER");
- return this.formatResult(root, elemNames);
- }
-
- if(stmt.equals("stmt1")){//Check First Customer's LastName is 1957.09.27
- return myformat.format(root.getDate("CUSTOMER[1]/LASTNAME"));
- }
-
- if(stmt.equals("stmt2")||stmt.equals("stmt3")){//Set First Customer's LastName to 1966.12.20 OR
- //Check First Customer's LastName is 1966.12.20
- root.setDate("CUSTOMER[1]/LASTNAME", tbday);
- das.applyChanges(root);
- // Read
- root = read.executeQuery();
- return myformat.format(root.getDate("CUSTOMER[1]/LASTNAME"));
- }
-
- return null;
- }
- /* Converter example end**/
-
- /*For test*/
- public static void main(String[] args){
- DASQueryProcessor qryProc = new DASQueryProcessor();
- try{
- qryProc.execute("command:AllCompaniesAndDepartments", "DasConfig.xml");
- }catch(Exception e){
- e.printStackTrace();
- }
-
- }
-
-}
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/SillyDateStringConverter.java b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/SillyDateStringConverter.java
deleted file mode 100644
index f1fe21cfd4..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/SillyDateStringConverter.java
+++ /dev/null
@@ -1,75 +0,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.
- */
-package org.apache.tuscany.samples.das;
-
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import org.apache.tuscany.das.rdb.Converter;
-
-public class SillyDateStringConverter implements Converter {
-
- private static DateFormat myformat = new SimpleDateFormat("yyyy.MM.dd");
-
- private static Date kbday;
-
- private static Date tbday;
-
- public SillyDateStringConverter() {
- super();
- }
-
- static {
- try {
- kbday = myformat.parse("1957.09.27");
- tbday = myformat.parse("1966.12.20");
- } catch (ParseException e) {
- throw new RuntimeException(e);
- }
- }
-
- public Object getPropertyValue(Object columnData) {
- if (columnData.equals("Pavick")) {
- return kbday;
- }
-
- if (columnData.equals("Williams")) {
- return tbday;
- }
-
- throw new IllegalArgumentException();
-
- }
-
- public Object getColumnValue(Object propertyData) {
- if (propertyData.equals(kbday)) {
- return "Pavick";
- }
-
- if (propertyData.equals(tbday)) {
- return "Williams";
- }
-
- throw new IllegalArgumentException();
-
- }
-
-}
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/StringToLongConverter.java b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/StringToLongConverter.java
deleted file mode 100644
index fc26164191..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/StringToLongConverter.java
+++ /dev/null
@@ -1,37 +0,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.
- */
-package org.apache.tuscany.samples.das;
-
-import org.apache.tuscany.das.rdb.Converter;
-
-public class StringToLongConverter implements Converter {
-
- public StringToLongConverter() {
- super();
- }
-
- public Object getPropertyValue(Object columnData) {
- return new Long(columnData.toString());
- }
-
- public Object getColumnValue(Object columnData) {
- return columnData.toString();
- }
-
-}
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/util/XmlUtil.java b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/util/XmlUtil.java
deleted file mode 100644
index 9a615fa33c..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/das/util/XmlUtil.java
+++ /dev/null
@@ -1,58 +0,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.
- */
-package org.apache.tuscany.samples.das.util;
-/**
- *
- * XML utilities
- *
- */
-public class XmlUtil {
- /**
- * From the complete serialized DataGraph, get the required portion
- *relevant to <das:DataGraphRoot> element.
- */
- public static String getXmlContents(String xmlString, String xmlStartElement, String xmlEndElement){
- int posStartElement = xmlString.indexOf(xmlStartElement);
- int posEndElement = xmlString.indexOf(xmlEndElement) ;
-
- //check if startElement was not found
- if(posStartElement == -1)
- posStartElement = 0;
-
- //check if endElement was not found
- if(posEndElement == -1)
- posEndElement = xmlString.length();
- else
- //fixup the posEndElement to return the closing element tag
- posEndElement += + xmlEndElement.length();
-
- //return xml contents for the requested element
- String xmlBody = xmlString.substring(posStartElement, posEndElement);
-
-
- String result =
- "<?xml version='1.0' encoding='ISO-8859-1' ?> \n"+
- "<root xmlns:das='http://org.apache.tuscany.das.rdb/config.xsd' "+
- " xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> \n"+
- xmlBody+" </root>";
-
- return result;
- }
-
-}
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/web/CommandServlet.java b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/web/CommandServlet.java
deleted file mode 100644
index 26a1f468a7..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/web/CommandServlet.java
+++ /dev/null
@@ -1,160 +0,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.
- */
-package org.apache.tuscany.samples.web;
-
-import java.io.IOException;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.tuscany.das.rdb.dbconfig.DBInitializer;
-/**
- * This is generic servlet where based on serviceName, it will call the speciliazed processor to
- * process request and obtain response. This servlet can be used in any web sample, just needs to
- * pass appropriate serviceProcessorClassName and rest is generic
- *
- */
-public class CommandServlet extends HttpServlet {
- final static long serialVersionUID = 1221332432;
- /*
- * (non-Java-doc)
- *
- * @see javax.servlet.http.HttpServlet#HttpServlet()
- */
- public CommandServlet() {
- super();
- }
-
- public static void refreshDB() throws ServletException {
- try{
- DBInitializer dbInitializer = new DBInitializer("AjaxDBConfig.xml");
- dbInitializer.refreshDatabaseData();
- }catch(Exception e){
- e.printStackTrace();
- ServletException se = new ServletException(e.getMessage());
- throw se;
- }
- }
-
- public void init(ServletConfig config) throws ServletException {
- refreshDB();
- }
-
- /*
- * (non-Java-doc)
- *
- * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest arg0,
- * HttpServletResponse arg1)
- */
- protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- doTask(request, response);
- }
-
- /*
- * (non-Java-doc)
- *
- * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest arg0,
- * HttpServletResponse arg1)
- */
- protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- doTask(request, response);
- }
-
- /**Invoke passed service and return result
- *
- * @param req
- * @param resp
- * @throws ServletException
- * @throws IOException
- */
- public void doTask(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
- String textContentType= "text/text";
- String xmlContentType= "text/xml";
-
- String refreshRequest = req.getParameter("refreshDB");
- if(refreshRequest != null && refreshRequest.equals("yes")){
- {
- try{
- refreshDB();
- }catch(ServletException e){
- throw e;
- }
- }
- this.writeResponse(resp, "Refreshed database!", textContentType);
- }
- else{
- String serviceName = req.getParameter("serviceName");//e.g. DASQueryProcessor
- String qry = req.getParameter("Query");//e.g. query:xxx, command:yyy
- String configFile = req.getParameter("configFile");//name of DAS config file
-
- try{
- ServiceProcessor serviceClassInst = null;
- //so any subclass of abstract ServiceProcessor can be used
- Object obj = Class.forName(serviceName).newInstance();
-
- if(obj instanceof ServiceProcessor){
- serviceClassInst = (ServiceProcessor)obj;
- }
-
- String result = serviceClassInst.execute(qry, configFile);
- this.writeResponse(resp, result, xmlContentType);
- }catch(Exception e){
- this.writeResponse(resp, e.getMessage(), textContentType);
- e.printStackTrace();
- }
- }
- }
-
- /**Write response in required content type to servlet response
- *
- * @param resp
- * @param output
- * @param contentType
- * @throws IOException
- */
- public void writeResponse(HttpServletResponse resp, String output, String contentType) throws IOException {
- resp.setContentType(contentType);//"text/text", "text/xml"
- resp.setHeader("Cache-Control", "no-cache");
- resp.getWriter().write(output);
- }
-
- // Utility methods
-
- public void gotoURL(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response, String url) throws ServletException, IOException {
- url = response.encodeURL(url);
- RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(url);
- dispatcher.forward(request, response);
- }
-
- public void redirectURL(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response, String url) throws ServletException, IOException {
- url = response.encodeURL(request.getContextPath() + url);
- response.sendRedirect(url);
- }
-
- public void forwardURL(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response, String url) throws ServletException, IOException {
- url = response.encodeURL(url);
- RequestDispatcher dispatch = getServletContext().getRequestDispatcher(url);
- dispatch.forward(request, response);
- }
-}
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/web/ServiceProcessor.java b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/web/ServiceProcessor.java
deleted file mode 100644
index aefebb8808..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/java/org/apache/tuscany/samples/web/ServiceProcessor.java
+++ /dev/null
@@ -1,24 +0,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.
- */
-package org.apache.tuscany.samples.web;
-
-//generic processor
-public abstract class ServiceProcessor {
- public abstract String execute(String command, String configFile) throws Exception;
-}
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/AjaxDBConfig.xml b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/AjaxDBConfig.xml
deleted file mode 100644
index f172c089c9..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/AjaxDBConfig.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- 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.
- -->
-<DBConfig xmlns="http:///org.apache.tuscany.das.rdb/dbconfig.xsd">
-
- <!--Uncomment below for web container derby database setup-->
- <ConnectionInfo dataSource="java:comp/env/jdbc/ajaxdastest">
- </ConnectionInfo>
-
- <!--<ConnectionInfo>
- <ConnectionProperties
- driverClass="org.apache.derby.jdbc.EmbeddedDriver"
- databaseURL="jdbc:derby:target/dastest; create = true"
- loginTimeout="600000"/>
- </ConnectionInfo>-->
-
- <Table name="COMPANY" SQLCreate="CREATE TABLE COMPANY (ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY, NAME VARCHAR(30))">
- <row>'ACME Publishing'</row>
- <row>'Do-rite plumbing'</row>
- <row>'MegaCorp'</row>
- </Table>
-
- <Table name="DEPARTMENT" SQLCreate="CREATE TABLE DEPARTMENT (ID INT PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY, NAME VARCHAR(30),LOCATION VARCHAR(30), DEPNUMBER VARCHAR(10),COMPANYID INT)">
- <row>'Advanced Technologies', 'NY', '123', 1</row>
- </Table>
-
- <Table name="CUSTOMER" SQLCreate="CREATE TABLE CUSTOMER (ID INT PRIMARY KEY NOT NULL,LASTNAME VARCHAR(30),ADDRESS VARCHAR(10) )">
- <row>1, 'Pavick', 'CA'</row>
- <row>2, 'Williams', 'NJ'</row>
- </Table>
-
- <Table name="BOOK" SQLCreate="CREATE TABLE BOOK (BOOK_ID INT PRIMARY KEY NOT NULL,NAME VARCHAR(30),AUTHOR VARCHAR(30),QUANTITY INT, OCC INT )">
- <row>1, 'The Brothers Karamazov', 'Fyodor Dostoevsky',5, 17</row>
- </Table>
-
-</DBConfig>
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/CustomerConfigWithConverter.xml b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/CustomerConfigWithConverter.xml
deleted file mode 100644
index 0ef0c5b9b1..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/CustomerConfigWithConverter.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- 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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd">
- <ConnectionInfo dataSource="java:comp/env/jdbc/ajaxdastest"/>
-
- <Command name="testArbitraryConverter" SQL="Select * from CUSTOMER where ID = 1" kind="Select">
- <ResultDescriptor columnName="ID" tableName="CUSTOMER" columnType="commonj.sdo.IntObject"/>
- <ResultDescriptor columnName="LASTNAME" tableName="CUSTOMER" columnType="commonj.sdo.Date"/>
- <ResultDescriptor columnName="ADDRESS" tableName="CUSTOMER" columnType="commonj.sdo.String"/>
- </Command>
-
- <Table tableName="CUSTOMER">
- <Column columnName="ID" primaryKey="true"/>
- <Column columnName="LASTNAME" converterClassName="org.apache.tuscany.samples.das.SillyDateStringConverter"/>
- </Table>
-
-</Config>
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/CustomerConfigWithIDConverter.xml b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/CustomerConfigWithIDConverter.xml
deleted file mode 100644
index f26082a340..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/CustomerConfigWithIDConverter.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- 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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd">
- <ConnectionInfo dataSource="java:comp/env/jdbc/ajaxdastest"/>
-
- <Command name="literal" SQL="Select 99, 'Roosevelt', '1600 Pennsylvania Avenue' from customer" kind="Select">
- <ResultDescriptor columnName="ID" tableName="CUSTOMER" columnType="commonj.sdo.Long"/>
- <ResultDescriptor columnName="LASTNAME" tableName="CUSTOMER" columnType="commonj.sdo.String"/>
- <ResultDescriptor columnName="ADDRESS" tableName="CUSTOMER" columnType="commonj.sdo.String"/>
- </Command>
-
- <Table tableName="CUSTOMER">
- <Column columnName="ID" converterClassName="org.apache.tuscany.samples.das.StringToLongConverter"/>
- </Table>
-
-</Config>
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/DasConfig.xml b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/DasConfig.xml
deleted file mode 100644
index 69ac31895c..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/DasConfig.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
- -->
-<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <ConnectionInfo dataSource="java:comp/env/jdbc/ajaxdastest"/>
-
- <Command name="AllCompanies" SQL="select * from COMPANY" kind="Select"/>
-
- <Command name="AllCompaniesAndDepartments" SQL="select * from COMPANY left outer join DEPARTMENT on COMPANY.ID = DEPARTMENT.COMPANYID" kind="Select"/>
-
- <Table tableName="COMPANY">
- <Column columnName="ID" primaryKey="true" generated="true"/>
- </Table>
-
- <Table tableName="DEPARTMENT">
- <Column columnName="ID" primaryKey="true" generated="true"/>
- </Table>
-
- <Table tableName="BOOK">
- <Column columnName="BOOK_ID" primaryKey="true" generated="true"/>
- </Table>
-
- <Relationship name="departments" primaryKeyTable="COMPANY" foreignKeyTable="DEPARTMENT" many="true">
- <KeyPair primaryKeyColumn="ID" foreignKeyColumn="COMPANYID"/>
- </Relationship>
-
-
-</Config>
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/META-INF/LICENSE b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/META-INF/LICENSE
deleted file mode 100644
index fb4df3722c..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/META-INF/LICENSE
+++ /dev/null
@@ -1,353 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
-===============================================================================================================
-
-Other components and dependencies under Apache Software License 2.0 :
-
- log4j-1.2.14.jar - Apache Logging Services
- derby 10.2.2.0.jar - Apache Derby
- stax-api-1.0.1.jar - The Streaming API for XML (StAX)
- wstx-asl-3.2.0.jar - WoodStox StAX implementation
- standard-1.1.1.jar - The Apache Jackarta Taglibs
- jstl-1.1.2.jar - The Apache Jackarta Taglibs
- *.tld - The Apache Jackarta Taglibs
-
-===============================================================================================================
-
-
-Apache Tuscany SDO for Java Subcomponents
-=========================================:
-
-The Tuscany SDO for Java release includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-License for the Service Data Objects JavaDoc and Interface Definition files. (tuscany-sdo-api-r2.1-1.0-incubating.jar)
-
-Permission to copy, make derivative works of, and distribute the Service Data Objects
-JavaDoc and Interface Definition Files files in any medium without fee or royalty as part
-of a compliant implementation of the Service Data Objects Specification is hereby granted.
-The Service Data Objects Specification may be found at any of the following locations:
-
-http://dev2dev.bea.com/technologies/commonj/index.jsp
-http://www.ibm.com/developerworks/library/specification/ws-sdo/
-http://oracle.com/technology/webservices/sca
-https://www.sdn.sap.com/
-http://www.xcalia/xdn/specs/sdo
-
-THE SERVICE DATA OBJECTS SPECIFICATION AND THE JAVADOC AND INTERFACE DEFINITION FILES
-ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS
-SPECIFICATION OR THE JAVADOC AND INTERFACE DEFINITION FILES AND THE IMPLEMENTATION OF THEIR CONTENTS,
-INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
-NON-INFRINGEMENT OR TITLE. THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL,
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE
-SERVICE DATA OBJECTS SPECIFICATION OR THE JAVADOC OR INTERFACE DEFINTION FILES.
-
-The name and trademarks of the Authors may NOT be used in any manner, including advertising or
-publicity pertaining to the Service Component Architecture Specification or its contents without specific,
-written prior permission. Title to copyright in the Service Data Objects Specification and the
-JavaDoc and Interface Definition Files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-=================================================================================================================
-
-For the Eclipse EMF components
-(codegen-2.2.3.jar
-codegen-ecore-2.2.3.jar
-common-2.2.3.jar
-ecore-2.2.3.jar
-ecore-change-2.2.3.jar
-ecore-xmi-2.2.3.jar
-xsd-2.2.3.jar)
-
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
-
-===================================================================================================
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/META-INF/NOTICE b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index c2cf1f95b4..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,32 +0,0 @@
-Apache Tuscany SDO for Java
-Copyright 2006, 2007 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-Apache Tuscany is an effort undergoing incubation at The Apache Software Foundation (ASF),
-sponsored by the Apache Web Services PMC. Incubation is required of all newly accepted
-projects until a further review indicates that the infrastructure, communications,
-and decision making process have stabilized in a manner consistent with other successful
-ASF projects. While incubation status is not necessarily a reflection of the completeness
-or stability of the code, it does indicate that the project has yet to be fully endorsed
-by the ASF.
-
-Unless otherwise indicated, all distribution made available by the Apache Software Foundation
-is provided to you under the terms and conditions of the Apache License Version 2.0 ("AL").
-A copy of the AL is provided with this distribution as the LICENSE.txt file present in the
-root directory, and is also available at http://www.apache.org/licenses/.
-
-The terms and conditions governing the distribution may refer to the AL or other license
-agreements, notices or terms and conditions. Some of these other license agreements may
-include (but are not limited to):
-
- . Eclipse Public License Version 1.0 (available at http://www.eclipse.org/legal/epl-v10.html)
-
-It is your obligation to read and accept all such terms and conditions prior to use of the
-distribution. If term or condition is provided, please contact the Apache Software Foundation
-to determine what terms and conditions govern that particular distribution.
-
-This product also includes software developed by the Open Service Oriented Architecture organisation
-(http://osoa.org). The license for this software may be found in the LICENSE.txt file contained in this
-distribution.
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/META-INF/README b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/META-INF/README
deleted file mode 100644
index d1905ee3e8..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/META-INF/README
+++ /dev/null
@@ -1,35 +0,0 @@
-Apache Tuscany M2 build (October, 2006)
-===================================
-
-http://incubator.apache.org/tuscany/
-
-Tuscany is an effort undergoing incubation at the Apache Software Foundation
-(ASF), sponsored by the Web Services PMC.
-
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects.
-
-While incubation status is not necessarily a reflection of the completeness or
-stability of the code, it does indicate that the project has yet to be fully
-endorsed by the ASF.
-
-
-Support
--------
-
-Any problem with this release can be reported to the Tuscany mailing list
-or in the JIRA issue tracker.
-
-Mailing list subscription:
- tuscany-dev-subscribe@ws.apache.org
-
-Jira:
- http://issues.apache.org/jira/browse/Tuscany
-
-
-Thank you for using Tuscany!
-
-
-The Tuscany Team.
-
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/log4j.properties b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/log4j.properties
deleted file mode 100644
index 7f18e4dc72..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,36 +0,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.
-#
-# Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=INFO, NULL
-
-# NULL Appender
-log4j.appender.NULL=org.apache.log4j.varia.NullAppender
-
-log4j.appender.NULL.layout=org.apache.log4j.PatternLayout
-log4j.appender.NULL.layout.ConversionPattern=[DAS RDB] - %c{1}.%M (%L) : %m %n
-
-# CONSOLE is set to be a ConsoleAppender.
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=[DAS RDB] - %c{1}.%M (%L) : %m %n
-
-
-# Print only messages of level WARN or above in the package com.foo.
-log4j.logger.org.apache.tuscany=NONE \ No newline at end of file
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/META-INF/context.xml b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/META-INF/context.xml
deleted file mode 100644
index e2da613636..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/META-INF/context.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed 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.
- -->
-<Context path="/DAS Stand alone app" debug="5" reloadable="true" crossContext="true">
-
- <Manager pathname=""/>
- <ResourceLink name="jdbc/ajaxdastest" global="jdbc/ajaxdastest" type="javax.sql.DataSource" />
-
-</Context>
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/WEB-INF/tld/c.tld b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/WEB-INF/tld/c.tld
deleted file mode 100644
index 22698c97dc..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/WEB-INF/tld/c.tld
+++ /dev/null
@@ -1,563 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
- version="2.0">
-
- <description>JSTL 1.1 core library</description>
- <display-name>JSTL core</display-name>
- <tlib-version>1.1</tlib-version>
- <short-name>c</short-name>
- <uri>http://java.sun.com/jsp/jstl/core</uri>
-
- <validator>
- <description>
- Provides core validation features for JSTL tags.
- </description>
- <validator-class>
- org.apache.taglibs.standard.tlv.JstlCoreTLV
- </validator-class>
- </validator>
-
- <tag>
- <description>
- Catches any Throwable that occurs in its body and optionally
- exposes it.
- </description>
- <name>catch</name>
- <tag-class>org.apache.taglibs.standard.tag.common.core.CatchTag</tag-class>
- <body-content>JSP</body-content>
- <attribute>
- <description>
-Name of the exported scoped variable for the
-exception thrown from a nested action. The type of the
-scoped variable is the type of the exception thrown.
- </description>
- <name>var</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <description>
- Simple conditional tag that establishes a context for
- mutually exclusive conditional operations, marked by
- &lt;when&gt; and &lt;otherwise&gt;
- </description>
- <name>choose</name>
- <tag-class>org.apache.taglibs.standard.tag.common.core.ChooseTag</tag-class>
- <body-content>JSP</body-content>
- </tag>
-
- <tag>
- <description>
- Simple conditional tag, which evalutes its body if the
- supplied condition is true and optionally exposes a Boolean
- scripting variable representing the evaluation of this condition
- </description>
- <name>if</name>
- <tag-class>org.apache.taglibs.standard.tag.rt.core.IfTag</tag-class>
- <body-content>JSP</body-content>
- <attribute>
- <description>
-The test condition that determines whether or
-not the body content should be processed.
- </description>
- <name>test</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
-Name of the exported scoped variable for the
-resulting value of the test condition. The type
-of the scoped variable is Boolean.
- </description>
- <name>var</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Scope for var.
- </description>
- <name>scope</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <description>
- Retrieves an absolute or relative URL and exposes its contents
- to either the page, a String in 'var', or a Reader in 'varReader'.
- </description>
- <name>import</name>
- <tag-class>org.apache.taglibs.standard.tag.rt.core.ImportTag</tag-class>
- <tei-class>org.apache.taglibs.standard.tei.ImportTEI</tei-class>
- <body-content>JSP</body-content>
- <attribute>
- <description>
-The URL of the resource to import.
- </description>
- <name>url</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Name of the exported scoped variable for the
-resource's content. The type of the scoped
-variable is String.
- </description>
- <name>var</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Scope for var.
- </description>
- <name>scope</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Name of the exported scoped variable for the
-resource's content. The type of the scoped
-variable is Reader.
- </description>
- <name>varReader</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Name of the context when accessing a relative
-URL resource that belongs to a foreign
-context.
- </description>
- <name>context</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Character encoding of the content at the input
-resource.
- </description>
- <name>charEncoding</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <description>
- The basic iteration tag, accepting many different
- collection types and supporting subsetting and other
- functionality
- </description>
- <name>forEach</name>
- <tag-class>org.apache.taglibs.standard.tag.rt.core.ForEachTag</tag-class>
- <tei-class>org.apache.taglibs.standard.tei.ForEachTEI</tei-class>
- <body-content>JSP</body-content>
- <attribute>
- <description>
-Collection of items to iterate over.
- </description>
- <name>items</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
-If items specified:
-Iteration begins at the item located at the
-specified index. First item of the collection has
-index 0.
-If items not specified:
-Iteration begins with index set at the value
-specified.
- </description>
- <name>begin</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
-If items specified:
-Iteration ends at the item located at the
-specified index (inclusive).
-If items not specified:
-Iteration ends when index reaches the value
-specified.
- </description>
- <name>end</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
-Iteration will only process every step items of
-the collection, starting with the first one.
- </description>
- <name>step</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
-Name of the exported scoped variable for the
-current item of the iteration. This scoped
-variable has nested visibility. Its type depends
-on the object of the underlying collection.
- </description>
- <name>var</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Name of the exported scoped variable for the
-status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
-visibility.
- </description>
- <name>varStatus</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <description>
- Iterates over tokens, separated by the supplied delimeters
- </description>
- <name>forTokens</name>
- <tag-class>org.apache.taglibs.standard.tag.rt.core.ForTokensTag</tag-class>
- <body-content>JSP</body-content>
- <attribute>
- <description>
-String of tokens to iterate over.
- </description>
- <name>items</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-The set of delimiters (the characters that
-separate the tokens in the string).
- </description>
- <name>delims</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-Iteration begins at the token located at the
-specified index. First token has index 0.
- </description>
- <name>begin</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
-Iteration ends at the token located at the
-specified index (inclusive).
- </description>
- <name>end</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
-Iteration will only process every step tokens
-of the string, starting with the first one.
- </description>
- <name>step</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
-Name of the exported scoped variable for the
-current item of the iteration. This scoped
-variable has nested visibility.
- </description>
- <name>var</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Name of the exported scoped variable for the
-status of the iteration. Object exported is of
-type
-javax.servlet.jsp.jstl.core.LoopTag
-Status. This scoped variable has nested
-visibility.
- </description>
- <name>varStatus</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <description>
- Like &lt;%= ... &gt;, but for expressions.
- </description>
- <name>out</name>
- <tag-class>org.apache.taglibs.standard.tag.rt.core.OutTag</tag-class>
- <body-content>JSP</body-content>
- <attribute>
- <description>
-Expression to be evaluated.
- </description>
- <name>value</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Default value if the resulting value is null.
- </description>
- <name>default</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Determines whether characters &lt;,&gt;,&amp;,'," in the
-resulting string should be converted to their
-corresponding character entity codes. Default value is
-true.
- </description>
- <name>escapeXml</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
-
-
- <tag>
- <description>
- Subtag of &lt;choose&gt; that follows &lt;when&gt; tags
- and runs only if all of the prior conditions evaluated to
- 'false'
- </description>
- <name>otherwise</name>
- <tag-class>org.apache.taglibs.standard.tag.common.core.OtherwiseTag</tag-class>
- <body-content>JSP</body-content>
- </tag>
-
- <tag>
- <description>
- Adds a parameter to a containing 'import' tag's URL.
- </description>
- <name>param</name>
- <tag-class>org.apache.taglibs.standard.tag.rt.core.ParamTag</tag-class>
- <body-content>JSP</body-content>
- <attribute>
- <description>
-Name of the query string parameter.
- </description>
- <name>name</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Value of the parameter.
- </description>
- <name>value</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <description>
- Redirects to a new URL.
- </description>
- <name>redirect</name>
- <tag-class>org.apache.taglibs.standard.tag.rt.core.RedirectTag</tag-class>
- <body-content>JSP</body-content>
- <attribute>
- <description>
-The URL of the resource to redirect to.
- </description>
- <name>url</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Name of the context when redirecting to a relative URL
-resource that belongs to a foreign context.
- </description>
- <name>context</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <description>
- Removes a scoped variable (from a particular scope, if specified).
- </description>
- <name>remove</name>
- <tag-class>org.apache.taglibs.standard.tag.common.core.RemoveTag</tag-class>
- <body-content>empty</body-content>
- <attribute>
- <description>
-Name of the scoped variable to be removed.
- </description>
- <name>var</name>
- <required>true</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Scope for var.
- </description>
- <name>scope</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <description>
- Sets the result of an expression evaluation in a 'scope'
- </description>
- <name>set</name>
- <tag-class>org.apache.taglibs.standard.tag.rt.core.SetTag</tag-class>
- <body-content>JSP</body-content>
- <attribute>
- <description>
-Name of the exported scoped variable to hold the value
-specified in the action. The type of the scoped variable is
-whatever type the value expression evaluates to.
- </description>
- <name>var</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Expression to be evaluated.
- </description>
- <name>value</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Target object whose property will be set. Must evaluate to
-a JavaBeans object with setter property property, or to a
-java.util.Map object.
- </description>
- <name>target</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Name of the property to be set in the target object.
- </description>
- <name>property</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Scope for var.
- </description>
- <name>scope</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <description>
- Creates a URL with optional query parameters.
- </description>
- <name>url</name>
- <tag-class>org.apache.taglibs.standard.tag.rt.core.UrlTag</tag-class>
- <body-content>JSP</body-content>
- <attribute>
- <description>
-Name of the exported scoped variable for the
-processed url. The type of the scoped variable is
-String.
- </description>
- <name>var</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Scope for var.
- </description>
- <name>scope</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-URL to be processed.
- </description>
- <name>value</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Name of the context when specifying a relative URL
-resource that belongs to a foreign context.
- </description>
- <name>context</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <description>
- Subtag of &lt;choose&gt; that includes its body if its
- condition evalutes to 'true'
- </description>
- <name>when</name>
- <tag-class>org.apache.taglibs.standard.tag.rt.core.WhenTag</tag-class>
- <body-content>JSP</body-content>
- <attribute>
- <description>
-The test condition that determines whether or not the
-body content should be processed.
- </description>
- <name>test</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- <type>boolean</type>
- </attribute>
- </tag>
-
-</taglib>
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/WEB-INF/tld/fmt.tld b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/WEB-INF/tld/fmt.tld
deleted file mode 100644
index 3b9a54a87d..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/WEB-INF/tld/fmt.tld
+++ /dev/null
@@ -1,671 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
- version="2.0">
-
- <description>JSTL 1.1 i18n-capable formatting library</description>
- <display-name>JSTL fmt</display-name>
- <tlib-version>1.1</tlib-version>
- <short-name>fmt</short-name>
- <uri>http://java.sun.com/jsp/jstl/fmt</uri>
-
- <validator>
- <description>
- Provides core validation features for JSTL tags.
- </description>
- <validator-class>
- org.apache.taglibs.standard.tlv.JstlFmtTLV
- </validator-class>
- </validator>
-
- <tag>
- <description>
- Sets the request character encoding
- </description>
- <name>requestEncoding</name>
- <tag-class>org.apache.taglibs.standard.tag.rt.fmt.RequestEncodingTag</tag-class>
- <body-content>empty</body-content>
- <attribute>
- <description>
-Name of character encoding to be applied when
-decoding request parameters.
- </description>
- <name>value</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <description>
- Stores the given locale in the locale configuration variable
- </description>
- <name>setLocale</name>
- <tag-class>org.apache.taglibs.standard.tag.rt.fmt.SetLocaleTag</tag-class>
- <body-content>empty</body-content>
- <attribute>
- <description>
-A String value is interpreted as the
-printable representation of a locale, which
-must contain a two-letter (lower-case)
-language code (as defined by ISO-639),
-and may contain a two-letter (upper-case)
-country code (as defined by ISO-3166).
-Language and country codes must be
-separated by hyphen (-) or underscore
-(_).
- </description>
- <name>value</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Vendor- or browser-specific variant.
-See the java.util.Locale javadocs for
-more information on variants.
- </description>
- <name>variant</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Scope of the locale configuration variable.
- </description>
- <name>scope</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <description>
- Specifies the time zone for any time formatting or parsing actions
- nested in its body
- </description>
- <name>timeZone</name>
- <tag-class>org.apache.taglibs.standard.tag.rt.fmt.TimeZoneTag</tag-class>
- <body-content>JSP</body-content>
- <attribute>
- <description>
-The time zone. A String value is interpreted as
-a time zone ID. This may be one of the time zone
-IDs supported by the Java platform (such as
-"America/Los_Angeles") or a custom time zone
-ID (such as "GMT-8"). See
-java.util.TimeZone for more information on
-supported time zone formats.
- </description>
- <name>value</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <description>
- Stores the given time zone in the time zone configuration variable
- </description>
- <name>setTimeZone</name>
- <tag-class>org.apache.taglibs.standard.tag.rt.fmt.SetTimeZoneTag</tag-class>
- <body-content>empty</body-content>
- <attribute>
- <description>
-The time zone. A String value is interpreted as
-a time zone ID. This may be one of the time zone
-IDs supported by the Java platform (such as
-"America/Los_Angeles") or a custom time zone
-ID (such as "GMT-8"). See java.util.TimeZone for
-more information on supported time zone
-formats.
- </description>
- <name>value</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Name of the exported scoped variable which
-stores the time zone of type
-java.util.TimeZone.
- </description>
- <name>var</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Scope of var or the time zone configuration
-variable.
- </description>
- <name>scope</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <description>
- Loads a resource bundle to be used by its tag body
- </description>
- <name>bundle</name>
- <tag-class>org.apache.taglibs.standard.tag.rt.fmt.BundleTag</tag-class>
- <body-content>JSP</body-content>
- <attribute>
- <description>
-Resource bundle base name. This is the bundle's
-fully-qualified resource name, which has the same
-form as a fully-qualified class name, that is, it uses
-"." as the package component separator and does not
-have any file type (such as ".class" or ".properties")
-suffix.
- </description>
- <name>basename</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Prefix to be prepended to the value of the message
-key of any nested &lt;fmt:message&gt; action.
- </description>
- <name>prefix</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <description>
- Loads a resource bundle and stores it in the named scoped variable or
- the bundle configuration variable
- </description>
- <name>setBundle</name>
- <tag-class>org.apache.taglibs.standard.tag.rt.fmt.SetBundleTag</tag-class>
- <body-content>empty</body-content>
- <attribute>
- <description>
-Resource bundle base name. This is the bundle's
-fully-qualified resource name, which has the same
-form as a fully-qualified class name, that is, it uses
-"." as the package component separator and does not
-have any file type (such as ".class" or ".properties")
-suffix.
- </description>
- <name>basename</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Name of the exported scoped variable which stores
-the i18n localization context of type
-javax.servlet.jsp.jstl.fmt.LocalizationC
-ontext.
- </description>
- <name>var</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Scope of var or the localization context
-configuration variable.
- </description>
- <name>scope</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <description>
- Maps key to localized message and performs parametric replacement
- </description>
- <name>message</name>
- <tag-class>org.apache.taglibs.standard.tag.rt.fmt.MessageTag</tag-class>
- <body-content>JSP</body-content>
- <attribute>
- <description>
-Message key to be looked up.
- </description>
- <name>key</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Localization context in whose resource
-bundle the message key is looked up.
- </description>
- <name>bundle</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Name of the exported scoped variable
-which stores the localized message.
- </description>
- <name>var</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Scope of var.
- </description>
- <name>scope</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <description>
- Supplies an argument for parametric replacement to a containing
- &lt;message&gt; tag
- </description>
- <name>param</name>
- <tag-class>org.apache.taglibs.standard.tag.rt.fmt.ParamTag</tag-class>
- <body-content>JSP</body-content>
- <attribute>
- <description>
-Argument used for parametric replacement.
- </description>
- <name>value</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <description>
- Formats a numeric value as a number, currency, or percentage
- </description>
- <name>formatNumber</name>
- <tag-class>org.apache.taglibs.standard.tag.rt.fmt.FormatNumberTag</tag-class>
- <body-content>JSP</body-content>
- <attribute>
- <description>
-Numeric value to be formatted.
- </description>
- <name>value</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Specifies whether the value is to be
-formatted as number, currency, or
-percentage.
- </description>
- <name>type</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Custom formatting pattern.
- </description>
- <name>pattern</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-ISO 4217 currency code. Applied only
-when formatting currencies (i.e. if type is
-equal to "currency"); ignored otherwise.
- </description>
- <name>currencyCode</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Currency symbol. Applied only when
-formatting currencies (i.e. if type is equal
-to "currency"); ignored otherwise.
- </description>
- <name>currencySymbol</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Specifies whether the formatted output
-will contain any grouping separators.
- </description>
- <name>groupingUsed</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Maximum number of digits in the integer
-portion of the formatted output.
- </description>
- <name>maxIntegerDigits</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Minimum number of digits in the integer
-portion of the formatted output.
- </description>
- <name>minIntegerDigits</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Maximum number of digits in the
-fractional portion of the formatted output.
- </description>
- <name>maxFractionDigits</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Minimum number of digits in the
-fractional portion of the formatted output.
- </description>
- <name>minFractionDigits</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Name of the exported scoped variable
-which stores the formatted result as a
-String.
- </description>
- <name>var</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Scope of var.
- </description>
- <name>scope</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <description>
- Parses the string representation of a number, currency, or percentage
- </description>
- <name>parseNumber</name>
- <tag-class>org.apache.taglibs.standard.tag.rt.fmt.ParseNumberTag</tag-class>
- <body-content>JSP</body-content>
- <attribute>
- <description>
-String to be parsed.
- </description>
- <name>value</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Specifies whether the string in the value
-attribute should be parsed as a number,
-currency, or percentage.
- </description>
- <name>type</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Custom formatting pattern that determines
-how the string in the value attribute is to be
-parsed.
- </description>
- <name>pattern</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Locale whose default formatting pattern (for
-numbers, currencies, or percentages,
-respectively) is to be used during the parse
-operation, or to which the pattern specified
-via the pattern attribute (if present) is
-applied.
- </description>
- <name>parseLocale</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Specifies whether just the integer portion of
-the given value should be parsed.
- </description>
- <name>integerOnly</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Name of the exported scoped variable which
-stores the parsed result (of type
-java.lang.Number).
- </description>
- <name>var</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Scope of var.
- </description>
- <name>scope</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <description>
- Formats a date and/or time using the supplied styles and pattern
- </description>
- <name>formatDate</name>
- <tag-class>org.apache.taglibs.standard.tag.rt.fmt.FormatDateTag</tag-class>
- <body-content>empty</body-content>
- <attribute>
- <description>
-Date and/or time to be formatted.
- </description>
- <name>value</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Specifies whether the time, the date, or both
-the time and date components of the given
-date are to be formatted.
- </description>
- <name>type</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Predefined formatting style for dates. Follows
-the semantics defined in class
-java.text.DateFormat. Applied only
-when formatting a date or both a date and
-time (i.e. if type is missing or is equal to
-"date" or "both"); ignored otherwise.
- </description>
- <name>dateStyle</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Predefined formatting style for times. Follows
-the semantics defined in class
-java.text.DateFormat. Applied only
-when formatting a time or both a date and
-time (i.e. if type is equal to "time" or "both");
-ignored otherwise.
- </description>
- <name>timeStyle</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Custom formatting style for dates and times.
- </description>
- <name>pattern</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Time zone in which to represent the formatted
-time.
- </description>
- <name>timeZone</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Name of the exported scoped variable which
-stores the formatted result as a String.
- </description>
- <name>var</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Scope of var.
- </description>
- <name>scope</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <description>
- Parses the string representation of a date and/or time
- </description>
- <name>parseDate</name>
- <tag-class>org.apache.taglibs.standard.tag.rt.fmt.ParseDateTag</tag-class>
- <body-content>JSP</body-content>
- <attribute>
- <description>
-Date string to be parsed.
- </description>
- <name>value</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Specifies whether the date string in the
-value attribute is supposed to contain a
-time, a date, or both.
- </description>
- <name>type</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Predefined formatting style for days
-which determines how the date
-component of the date string is to be
-parsed. Applied only when formatting a
-date or both a date and time (i.e. if type
-is missing or is equal to "date" or "both");
-ignored otherwise.
- </description>
- <name>dateStyle</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Predefined formatting styles for times
-which determines how the time
-component in the date string is to be
-parsed. Applied only when formatting a
-time or both a date and time (i.e. if type
-is equal to "time" or "both"); ignored
-otherwise.
- </description>
- <name>timeStyle</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Custom formatting pattern which
-determines how the date string is to be
-parsed.
- </description>
- <name>pattern</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Time zone in which to interpret any time
-information in the date string.
- </description>
- <name>timeZone</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Locale whose predefined formatting styles
-for dates and times are to be used during
-the parse operation, or to which the
-pattern specified via the pattern
-attribute (if present) is applied.
- </description>
- <name>parseLocale</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Name of the exported scoped variable in
-which the parsing result (of type
-java.util.Date) is stored.
- </description>
- <name>var</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <description>
-Scope of var.
- </description>
- <name>scope</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- </tag>
-
-</taglib>
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/WEB-INF/web.xml b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index c60d36566b..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
- Licensed 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.
- -->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app id="WebApp">
- <display-name>Tuscany DAS Features</display-name>
- <welcome-file-list id="WelcomeFileList">
- <welcome-file>html/DASWebSampleFrame.html</welcome-file>
- </welcome-file-list>
-
- <!-- Command Servlet -->
- <servlet>
- <display-name>CommandServlet</display-name>
- <servlet-name>CommandServlet</servlet-name>
- <servlet-class>org.apache.tuscany.samples.web.CommandServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>CommandServlet</servlet-name>
- <url-pattern>/CommandServlet</url-pattern>
- </servlet-mapping>
-
- <!-- JSTL Tag Library Descriptors -->
- <taglib>
- <taglib-uri>http://java.sun.com/jstl/core</taglib-uri>
- <taglib-location>/WEB-INF/tld/c.tld</taglib-location>
- </taglib>
- <taglib>
- <taglib-uri>http://java.sun.com/jstl/fmt</taglib-uri>
- <taglib-location>/WEB-INF/tld/fmt.tld</taglib-location>
- </taglib>
-</web-app>
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/html/DASWebSampleFrame.html b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/html/DASWebSampleFrame.html
deleted file mode 100644
index 49f913eaec..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/html/DASWebSampleFrame.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"
- "http://www.w3.org/TR/html4/frameset.dtd">
-<!--
- Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
- Licensed 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.
- -->
-
-<HTML>
-<HEAD>
-<TITLE>Tuscany DAS Web Sample</TITLE>
-</HEAD>
-<FRAMESET rows="40%,70%">
- <FRAME name="fixed" src="jsp/DASMenu.jsp">
- <FRAME name="dynamic" src="html/blank.html">
-</FRAMESET>
-</HTML> \ No newline at end of file
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/html/blank.html b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/html/blank.html
deleted file mode 100644
index 0bc2a49864..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/html/blank.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd">
-<!--
- Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
- Licensed 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.
- -->
-
-<HTML>
-<HEAD>
-<TITLE></TITLE>
-</HEAD>
-<BODY>
-</BODY>
-</HTML> \ No newline at end of file
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/js/ajax.js b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/js/ajax.js
deleted file mode 100644
index c0b0be5e54..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/js/ajax.js
+++ /dev/null
@@ -1,188 +0,0 @@
-//<!--
-// Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-//
-// Licensed 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.
-// -->
-
-var req;
-var url;
-var xslFileName;
-var brwsr;
-var htmlunitlimit;
-
-function startup(pageName) {
- if(pageName == 'adhoc'){
- document.forms[0].sqlQuery.focus = true;
- }
-
- if(pageName == 'command') {
- document.forms[0].DasCommand.focus = true;
- }
-}
-
-function init() {
- if (window.XMLHttpRequest) {
- brwsr="NOIE";
- req = new XMLHttpRequest();
- } else if (window.ActiveXObject) {
- brwsr="IE";
- req = new ActiveXObject("Microsoft.XMLHTTP");
- }
- var url = "../CommandServlet";
- req.open("POST", url, true);
- req.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
-}
-
-function formWaitMessage(){
- var swappableSection = document.getElementById('msg');
- if (window.XSLTProcessor)
- {
- swappableSection.innerHTML = '';
- var x = document.createTextNode('Retreiving result..please wait');
- swappableSection.appendChild(x);
- }
- else if(window.ActiveXObject)
- {
- swappableSection.innerHTML = 'Retreiving result..please wait' ;
- }
-}
-
-function executeQuery(reqParams, xslFileNameVal) {
- init();
- req.onreadystatechange = resultHandler;
- xslFileName = xslFileNameVal;
- //alert(reqParams);
- xsldocloaded = false;
- loadXsl();
- req.send(reqParams);
- //alert('req sent');
-}
-
- var xsldocloaded = false;
- var xsldoc;
-
-function loadXsl(){
- if(xslFileName != ''){
- if (window.XSLTProcessor)
- {
- // support Mozilla/Gecko based browsers
- xsldoc = document.implementation.createDocument("", "", null);
- xsldoc.addEventListener("load", onXslLoad, false);
- xsldoc.load(xslFileName);
- //alert("done loadXsl Mozilla");
- htmlunitlimit='false';
- }
- else if(window.ActiveXObject)
- {
- // support Windows / ActiveX
- xsldoc = new ActiveXObject("Microsoft.XMLDOM");
- xsldoc.ondataavailable = onXslLoad;
- xsldoc.load(xslFileName);
- //alert("done loadXsl IE");
- htmlunitlimit='false';
- }
- else{
- //alert('setiing htmlunitlimit true');
- htmlunitlimit='true';
- }
- }
-}
-
-function onXslLoad()
-{
- // flag that the xsl is loaded
- xsldocloaded = true;
-}
-
-function resultHandler()
-{
- // Make sure the request is loaded (readyState = 4)
- if (req.readyState == 4)
- {
- // Make sure the status is "OK"
- if (req.status == 200)
- {
- // Make sure the XSL document is loaded
- if (!xsldocloaded && xslFileName != '')
- {
- if(htmlunitlimit=='false'){
- alert("Unable to transform data. XSL is not yet loaded.");
- // break out of the function
- return;
- }
- else{
- var swappableSectionUT = document.getElementById('msg');
- if(brwsr=='NOIE'){
- //alert('limit case, xsl present, noie');
- swappableSectionUT.removeChild(swappableSectionUT.childNodes[0]);//remove wait message
- var x = document.createTextNode(req.responseText);
- swappableSectionUT.appendChild(x);
- }
- else{
- swappableSectionUT.innerHTML = req.responseText;
- }
- //alert('returning result:'+req.responseText);
- return;
- }
- }
-
- var swappableSection = document.getElementById("msg");
-
- if (window.XSLTProcessor)
- {
- if(xslFileName == ''){
- swappableSection.removeChild(swappableSection.childNodes[0]);//remove wait message
- var x = document.createTextNode(req.responseText);
- swappableSection.appendChild(x);
- }
- else{
- // support Mozilla/Gecko based browsers
- var xsltProcessor = new XSLTProcessor();
- xsltProcessor.importStylesheet(xsldoc);
- var outputXHTML = xsltProcessor
- .transformToFragment(req.responseXML, document);
- swappableSection.innerHTML = "";
- swappableSection.appendChild(outputXHTML);
- }
- }
- else if(window.ActiveXObject)
- {
- if(xslFileName == ''){
- swappableSection.innerHTML = req.responseText;
- }
- else{
- // support Windows/ActiveX enabled browsers
- var outputXHTML = req.responseXML.transformNode(xsldoc);
- swappableSection.innerHTML = outputXHTML;
- }
- }
- else{
- var swappableSectionUT = document.getElementById('msg');
- if(brwsr=='NOIE'){
- swappableSectionUT.removeChild(swappableSectionUT.childNodes[0]);//remove wait message
- var x = document.createTextNode(req.responseText);
- swappableSectionUT.appendChild(x);
- }
- else{
- swappableSectionUT.innerHTML = req.responseText;
- }
- return;
- }
- }
- else
- {
- alert("There was a problem retrieving the XML data:\n" +
- req.statusText);
- }
- }
-}
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/js/dasmenu.js b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/js/dasmenu.js
deleted file mode 100644
index 96b5d5288e..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/js/dasmenu.js
+++ /dev/null
@@ -1,112 +0,0 @@
-//<!--
-// Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-//
-// Licensed 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.
-// -->
-var dbstatus;
-var brwsrDB;
-var reqDB;
-
-function showSubMenu(){
- var objThis = this;
-
- for(var i = 0; i < objThis.childNodes.length; i++)
- {
- if(objThis.childNodes.item(i).nodeName == "UL")
- {
- objThis.childNodes.item(i).style.display = "block";
- }
- }
-}
-
-function hideSubMenu()
-{
- var objThis = this;
-
- for(var i = 0; i < objThis.childNodes.length; i++)
- {
- if(objThis.childNodes.item(i).nodeName == "UL")
- {
- objThis.childNodes.item(i).style.display = "none";
- return;
- }
- }
-}
-
-function initialiseMenu()
-{
- var objLICollection = document.body.getElementsByTagName("LI");
- for(var i = 0; i < objLICollection.length; i++)
- {
- var objLI = objLICollection[i];
- for(var j = 0; j < objLI.childNodes.length; j++)
- {
- if(objLI.childNodes.item(j).nodeName == "UL")
- {
- objLI.onmouseover=showSubMenu;
- objLI.onmouseout=hideSubMenu;
-
- for(var j = 0; j < objLI.childNodes.length; j++)
- {
- if(objLI.childNodes.item(j).nodeName == "A")
- {
- objLI.childNodes.item(j).className = "hassubmenu";
- }
- }
- }
- }
- }
-}
-
-function refreshdb(){
- if (window.XMLHttpRequest) {
- brwsrDB='NOIE';
- reqDB = new XMLHttpRequest();
- } else if (window.ActiveXObject) {
- brwsrDB='IE';
- reqDB = new ActiveXObject("Microsoft.XMLHTTP");
- }
-
- var dbRefreshMsg = document.getElementById('dbmsg');
- if(brwsrDB=='NOIE'){
- var x = document.createTextNode('Refreshing database..please wait');
- dbRefreshMsg.appendChild(x);
- }
- else{
- dbmsg.innerHTML = 'Refreshing database..please wait';
- }
-
- //TODO
- var urlDB = "../CommandServlet";
- reqDB.open("POST", urlDB, true);
- reqDB.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
- reqDB.onreadystatechange = dbresultHandler;
- reqDB.send('refreshDB=yes');
-}
-
-function dbresultHandler() {
- if (reqDB.readyState == 4) {
- if (reqDB.status == 200) {
- var dbRefreshMsg = document.getElementById('dbmsg');
- if(brwsrDB=='NOIE'){
- dbRefreshMsg.removeChild(dbRefreshMsg.childNodes[0]);//remove wait message
- var x = document.createTextNode('Refreshed database!');
- dbRefreshMsg.appendChild(x);
- }
- else{
- dbmsg.innerHTML = 'Refreshed database!';
- }
- return;
- }
- }
-}
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/DASMenu.jsp b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/DASMenu.jsp
deleted file mode 100644
index 041e05c8bb..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/DASMenu.jsp
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
- Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
- Licensed 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.
- -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <link rel="stylesheet" type="text/css" href="main.css" media="screen, print" />
- <script type="text/javascript" src="../js/dasmenu.js" >
- </script>
-
- <title>DASMenu: Web Sample</title>
- <meta name="description" content="DAS Features Demo" />
- <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
- <meta http-equiv="expires" content="-1" />
- <meta http-equiv="pragma" content="no-cache" />
- </head>
- <body onload="initialiseMenu();
-
- ">
- <h1>Tuscany DAS Web Sample</h1>
- <ul id="mainmenu">
- <li><a href="../html/blank.html" target="dynamic">Advanced Features</a>
- <ul>
- <li><a href="./occ.jsp" target="dynamic">OCC</a></li>
- <li><a href="./converter.jsp" target="dynamic">Converter</a></li>
- <li><a href="./rss.jsp" target="dynamic">Result Set Shape</a></li>
- </ul>
- </li>
- <li><a href="./indexAdhoc.jsp" target="dynamic">Adhoc Query</a></li>
- <li><a href="./indexCommand.jsp" target="dynamic">Command</a></li>
- </ul>
- <p>Tuscany DAS web sample demonstrates - simple adhoc queries, DAS predefined commands execution and
- some advanced features like Optimistic Concurrency Control (OCC), Converter, Result Set Shape etc.
- </p>
- <p>Check more details by navigating menu.
- Press <b>Refresh!</b> button anytime for database refresh.
- </p>
-
- <FORM name='MenuForm'>
- <INPUT TYPE="button" id="refreshButton" name="refreshButton" value="Refresh!"
- onClick=" refreshdb();
- "
- >
- </INPUT>
- <!-- Font for Status Message -->
- <font face="Arial,Helvetica,Verdana" size="2" color="#FF0000">
- <b id="dbmsg"></b>
- </font>
- </FORM>
- </body>
-</html> \ No newline at end of file
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/converter.jsp b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/converter.jsp
deleted file mode 100644
index a3610e7639..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/converter.jsp
+++ /dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<%--
- * Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed 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.
- --%>
-
-<%-- JSTL tags --%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
-
-<html>
-
-<head>
-<link href="default.css" rel="stylesheet" type="text/css">
-<script type="text/javascript" src="../js/ajax.js" >
-</script>
-
-</head>
-
-<body onload="startup()">
-
-<%@ page import="java.util.*" %>
-
-<font face="Arial,Helvetica,Verdana" size="3">
-
-<form name="DasForm" >
-
-<input type="hidden" id="serviceName" name="serviceName" value="org.apache.tuscany.samples.das.DASQueryProcessor"/>
-<input type="hidden" id="configFile" name="configFile" value="CustomerConfigWithConverter.xml"/>
-<input type="hidden" id="type" name="type" value="converter:"/>
-<input type="hidden" id="param" name="param" value=""/>
-<input type="hidden" id="xslFileName" name="xslFileName" value=""/>
-
-<b>Arbitrary Converter: </b>
- The column converted is a VARCAHAR.
- ResultSetShape is used to specify that the property will be a SDODataTypes.DATE.
- So this example uses a converter that transforms a string column into a date property
- and conversely, a date property back to a string for the underlying column.
- <br>
- The converter returns 1957.09.27 if the column value is "Pavick" and 1966.12.20 if
- the value is "Williams"
- <br>
- On write, the converter returns "Williams" if the property value is 1966.12.20 and "Pavick"
- if the property value is 1957.09.27
- <br>
- Check using direct database connection that the database table rows's column values are
- either "Williams" or "Pavick".
-<br>
-<hr width="90%" size="1">
-<input type="radio" name="stmt" id="stmt" checked="checked" value="stmt0">
-Select * from CUSTOMER where ID = 1;
-<br>
-<input type="radio" name="stmt" id="stmt" value="stmt1">
-Check First Customer's LastName is 1957.09.27
-<br>
-<input type="radio" name="stmt" id="stmt" value="stmt2">
-Set First Customer's LastName to 1966.12.20
-<br>
-<input type="radio" name="stmt" id="stmt" value="stmt3">
-Check First Customer's LastName is 1966.12.20
-<br>
-
-
-&nbsp; &nbsp;
-<input type="button" id="converterButton" name="converterButton" value="ExecuteTransaction"
- onclick="
- var varVal;
- if(this.form.stmt[0].checked){
- varVal = 'stmt0';
- xslFileName.value = '../xsl/customer.xsl';
- }
- if(this.form.stmt[1].checked){
- varVal = 'stmt1';
- xslFileName.value = '';
- }
- if(this.form.stmt[2].checked){
- varVal = 'stmt2';
- xslFileName.value = '';
- }
- if(this.form.stmt[3].checked){
- varVal = 'stmt3';
- xslFileName.value = '';
- }
-
- param.value = 'Query=' + this.form.type.value+varVal;
- param.value += '&serviceName='+this.form.serviceName.value;
- param.value += '&configFile='+this.form.configFile.value;
- executeQuery(param.value, xslFileName.value);
- formWaitMessage();
- ">
-</input>
-<hr>
-
-<!-- Font for Status Message -->
-<font face="Arial,Helvetica,Verdana" size="2" color="#FF0000">
-<div id="msg">&nbsp;</div>
-</font>
-<!-- Font End -->
-
-</form>
-
-</font>
-
-</body>
-</html>
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/default.css b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/default.css
deleted file mode 100644
index 5680fab9ed..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/default.css
+++ /dev/null
@@ -1,35 +0,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.
- */
-
-BODY {BACKGROUND-COLOR: #FFFFFF; COLOR: #333366; FONT-FAMILY: 'Times New Roman'}
-H1 {COLOR: #6666CC; FONT-FAMILY: 'Times New Roman'; TEXT-TRANSFORM: capitalize }
-H2 {COLOR: #6666CC; FONT-FAMILY: 'Times New Roman'; TEXT-TRANSFORM: capitalize }
-H3 {COLOR: #6666CC; FONT-FAMILY: 'Times New Roman'; TEXT-TRANSFORM: capitalize }
-H4 {COLOR: #6666CC; FONT-FAMILY: 'Times New Roman'; TEXT-TRANSFORM: capitalize }
-H5 {COLOR: #6666CC; FONT-FAMILY: 'Times New Roman'; TEXT-TRANSFORM: capitalize }
-H6 {COLOR: #6666CC; FONT-FAMILY: 'Times New Roman'; TEXT-TRANSFORM: capitalize }
-TH {COLOR: #000000; font-weight: bold }
-
-#TRowEven {background-color: #ccff99}
-#TRowOdd {background-color: #ffffcc}
-
-A:link {cursor:hand; color: #3300FF; text-decoration: none;}
-A:visited {cursor:hand; color: #3300FF; text-decoration: none; }
-A:active {cursor:hand; color:#FEAA02; text-decoration: none;}
-A:hover {cursor:hand; color:#FEAA02;}
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/indexAdhoc.jsp b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/indexAdhoc.jsp
deleted file mode 100644
index f212d744f1..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/indexAdhoc.jsp
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<%--
- * Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed 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.
- --%>
-
-<%-- JSTL tags --%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
-
-<html>
-
-<head>
-<link href="default.css" rel="stylesheet" type="text/css">
-<script type="text/javascript" src="../js/ajax.js" >
-</script>
-
-</head>
-
-<body onload="startup()">
-
-<%@ page import="java.util.*" %>
-
-<font face="Arial,Helvetica,Verdana" size="3">
-
-<form name="DasForm" >
-
-<input type="hidden" id="serviceName" name="serviceName" value="org.apache.tuscany.samples.das.DASQueryProcessor"/>
-<input type="hidden" id="configFile" name="configFile" value="DasConfig.xml"/>
-<input type="hidden" id="type" name="type" value="query:"/>
-<input type="hidden" id="param" name="param" value=""/>
-<input type="hidden" id="xslFileName" name="xslFileName" value=""/>
-
-<b>Adhoc SQL Query: </b><br>
-<select id="sqlQuery" name="sqlQuery"
- onfocus="this.form.queryButton.disabled=false;">
-<option value="NullQuery"></option>
-<option value="SELECT * FROM COMPANY">SELECT * FROM COMPANY</option>
-<option value="SELECT * FROM COMPANY LEFT OUTER JOIN DEPARTMENT ON COMPANY.ID = DEPARTMENT.COMPANYID">SELECT * FROM COMPANY LEFT OUTER JOIN DEPARTMENT ON COMPANY.ID = DEPARTMENT.COMPANYID</option>
-<option value="{INSERT INTO DEPARTMENT (NAME, COMPANYID) VALUES ('MyDept',1)}{SELECT * FROM COMPANY LEFT OUTER JOIN DEPARTMENT ON COMPANY.ID = DEPARTMENT.COMPANYID}">
- INSERT INTO DEPARTMENT (NAME, COMPANYID) VALUES ('MyDept',1)</option>
-<option value="{DELETE FROM DEPARTMENT WHERE DEPARTMENT.COMPANYID=1 and DEPARTMENT.ID>1}{SELECT * FROM COMPANY LEFT OUTER JOIN DEPARTMENT ON COMPANY.ID = DEPARTMENT.COMPANYID}">
- DELETE FROM DEPARTMENT WHERE COMPANYID=1 and ID>1</option>
-<option value="{UPDATE DEPARTMENT SET NAME='MyUpdDept' WHERE COMPANYID=1 AND ID=1}{SELECT * FROM COMPANY LEFT OUTER JOIN DEPARTMENT ON COMPANY.ID = DEPARTMENT.COMPANYID}">
- UPDATE DEPARTMENT SET NAME='MyUpdDept' WHERE COMPANYID=1 AND ID=1</option>
-</select>
-&nbsp; &nbsp;
-<input type="button" id="queryButton" name="queryButton" value="ExecuteQuery"
- onclick="
- if(this.form.sqlQuery.value=='SELECT * FROM COMPANY'){
- this.form.xslFileName.value = '../xsl/company.xsl';
- }
- else{
- this.form.xslFileName.value = '../xsl/companyDepartment.xsl';
- }
- param.value = 'Query=' + this.form.type.value+this.form.sqlQuery.value;
- param.value += '&serviceName='+this.form.serviceName.value;
- param.value += '&configFile='+this.form.configFile.value;
- executeQuery(param.value, xslFileName.value);
- formWaitMessage();
- " >
-</input>
-<hr>
-
-<!-- Font for Status Message -->
-<font face="Arial,Helvetica,Verdana" size="2" color="#FF0000">
-<div id="msg">&nbsp;</div>
-</font>
-<!-- Font End -->
-</form>
-
-</font>
-
-</body>
-</html>
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/indexCommand.jsp b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/indexCommand.jsp
deleted file mode 100644
index 55dcb56e38..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/indexCommand.jsp
+++ /dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<%--
- * Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed 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.
- --%>
-
-<%-- JSTL tags --%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
-
-<html>
-
-<head>
-<link href="default.css" rel="stylesheet" type="text/css">
-<script src="../js/ajax.js" language="javascript" type="text/javascript"></script>
-
-</head>
-
-<body onload="startup()">
-
-<%@ page import="java.util.*" %>
-
-<font face="Arial,Helvetica,Verdana" size="3">
-
-<form name="DasForm" >
-
-<input type="hidden" id="serviceName" name="serviceName" value="org.apache.tuscany.samples.das.DASQueryProcessor"/>
-<input type="hidden" id="configFile" name="configFile" value="DasConfig.xml"/>
-<input type="hidden" id="type" name="type" value="command:"/>
-<input type="hidden" id="param" name="param" value=""/>
-<input type="hidden" id="xslFileName" name="xslFileName" value=""/>
-
-<b>DAS Command: </b>
-
-<select id="DasCommand" name="DasCommand"
- onfocus="this.form.commandButton.disabled=false;">
-<option value="NullCommand"></option>
-<option value="AllCompanies">all companies</option>
-<option value="AllCompaniesAndDepartments">all companies and departments</option>
-<option value="AddDepartmentToFirstCompany">Add department to first company</option>
-<option value="DeleteDepartmentFromFirstCompany">Delete department from first company</option>
-<option value="UpdateCompanyDepartmentNames">Update one department name from first company</option>
-</select>
-
-
-<input type="button" id="commandButton" name="commandButton" value="ExecuteCommand"
- onclick="this.form.type.value='command:';
- if(this.form.DasCommand.value=='AllCompanies'){
- this.form.xslFileName.value = '../xsl/company.xsl';
- }
- else{
- this.form.xslFileName.value = '../xsl/companyDepartment.xsl';
- }
-
- param.value = 'Query=' + this.form.type.value+this.form.DasCommand.value;
- param.value += '&serviceName='+this.form.serviceName.value;
- param.value += '&configFile='+this.form.configFile.value;
- executeQuery(param.value, this.form.xslFileName.value);
- formWaitMessage();
- " >
-</input>
-<hr>
-<!-- Font for Status Message -->
-<font face="Arial,Helvetica,Verdana" size="2" color="#FF0000">
-<div id="msg">&nbsp;</div>
-</font>
-<!-- Font End -->
-</form>
-
-</font>
-
-</body>
-</html>
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/main.css b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/main.css
deleted file mode 100644
index 264facc985..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/main.css
+++ /dev/null
@@ -1,120 +0,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.
- */
-
-body
-{
- margin: 0px;
- border: 0px;
- padding: 0px;
- font-family: Verdana, Arial, Sans-Serif;
- font-size: 0px;
-}
-
-img
-{
- border: none 0px #ffffff;
-}
-
-h1
-{
- background-color: #ffcc00;
- border-bottom: solid 1px #333333;
- padding: 5px;
- margin: 0px;
- font-size: x-large;
-}
-
-h2
-{
- font-size: large;
-}
-
-p
-{
- font-size: small;
-}
-
-/* Real menu */
-ul, li
-{
- font-size: small;
- margin-top: 0px;
- margin-right: 0px;
- margin-bottom: 0px;
- display: block;
-}
-
-ul
-{
- width: 130px;
- border: solid 1px #333333;
- border-top: solid 5px #333333;
- border-right: solid 2px #333333;
- padding: 0px;
-}
-
-li ul
-{
- display: none;
- position: absolute;
- margin-left: 100px;
- margin-top: -20px;
-}
-
-li a
-{
- padding: 2px;
- text-decoration: none;
- color: #000000;
- background-color: #ffffee;
- width: 100%;
- display: block;
- border-bottom: dashed 1px #333333;
- text-indent: 2px;
- font-size: small;
-}
-
-li a:hover
-{
- background-color: #ffcc00;
- font-weight: bold;
- border-bottom: solid 1px #333333;
-}
-
-li
-{
- float: left;
- width: 98%;
-}
-
-a.hassubmenu
-{
- background-image: url(../img/lay_dmnuhassub.gif);
- background-repeat: no-repeat;
- background-position: 120px 7px;
-}
-
-#mainmenu
-{
- margin: 10px;
- margin-left: 5px;
- float: left;
- border-bottom: solid 2px #333333;
- margin-bottom: 100%;
-} \ No newline at end of file
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/occ.jsp b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/occ.jsp
deleted file mode 100644
index ed5a7ee0c1..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/occ.jsp
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<%--
- * Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed 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.
- --%>
-
-<%-- JSTL tags --%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
-
-<html>
-
-<head>
-<link href="default.css" rel="stylesheet" type="text/css">
-<script type="text/javascript" src="../js/ajax.js" >
-</script>
-
-</head>
-
-<body onload="startup()">
-
-<%@ page import="java.util.*" %>
-
-<font face="Arial,Helvetica,Verdana" size="3">
-
-<form name="DasForm" >
-
-<input type="hidden" id="serviceName" name="serviceName" value="org.apache.tuscany.samples.das.DASQueryProcessor"/>
-<input type="hidden" id="configFile" name="configFile" value="DasConfig.xml"/>
-<input type="hidden" id="type" name="type" value="occ:"/>
-<input type="hidden" id="param" name="param" value=""/>
-<input type="hidden" id="xslFileName" name="xslFileName" value=""/>
-
-<b>Automatic Optimistic Concurrency Control: </b>
- Try to modify same column in same database table row twice in one transaction.
-<br>
-<TEXTAREA name="occTransactions" id="occTransactions" rows="3" cols="60" readonly="true">
- Select * from BOOK where BOOK_ID = 1;
- update BOOK set NAME = 'Puss in Hat' where BOOK_ID = 1;
- 'UpdateNameForFirstBook'
-</TEXTAREA>
-
-&nbsp; &nbsp;
-<input type="button" id="occButton" name="occButton" value="ExecuteTransaction"
- onclick="
- param.value = 'Query=' + this.form.type.value;
- param.value += '&serviceName='+this.form.serviceName.value;
- param.value += '&configFile='+this.form.configFile.value;
- executeQuery(param.value, xslFileName.value);
- formWaitMessage();
- ">
-</input>
-<hr>
-
-<!-- Font for Status Message -->
-<font face="Arial,Helvetica,Verdana" size="2" color="#FF0000">
-<div id="msg">&nbsp;</div>
-</font>
-<!-- Font End -->
-</form>
-
-</font>
-
-</body>
-</html>
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/rss.jsp b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/rss.jsp
deleted file mode 100644
index 2d217d68b3..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/jsp/rss.jsp
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<%--
- * Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed 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.
- --%>
-
-<%-- JSTL tags --%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
-
-<html>
-
-<head>
-<link href="default.css" rel="stylesheet" type="text/css">
-<script type="text/javascript" src="../js/ajax.js" >
-</script>
-
-</head>
-
-<body onload="startup()">
-
-<%@ page import="java.util.*" %>
-
-<font face="Arial,Helvetica,Verdana" size="3">
-
-<form name="DasForm" >
-
-<input type="hidden" id="serviceName" name="serviceName" value="org.apache.tuscany.samples.das.DASQueryProcessor"/>
-<input type="hidden" id="configFile" name="configFile" value="CustomerConfigWithIDConverter.xml"/>
-<input type="hidden" id="type" name="type" value="rss:"/>
-<input type="hidden" id="param" name="param" value=""/>
-<input type="hidden" id="xslFileName" name="xslFileName" value=""/>
-
-<b>Result Set Shape: </b>
- DAS has ability to specify format(shape) of the ResultSet. This is necessary
- when the JDBC driver in use does not provide adequate support for ResultSetMetadata.
- Also, we expect that specifying the result set shape will increase performance.
-<br>
-<hr width="90%" size="1">
-<input type="text" name="stmt" id="stmt" value="literal" size="20">
-(Select 99, 'Roosevelt', '1600 Pennsylvania Avenue' from customer)
-
-&nbsp; &nbsp;
-<input type="button" id="rssButton" name="rssButton" value="ExecuteQuery"
- onclick="
- this.form.xslFileName.value='../xsl/customer.xsl';
- param.value = 'Query=' + this.form.type.value+this.form.stmt.value;
- param.value += '&serviceName='+this.form.serviceName.value;
- param.value += '&configFile='+this.form.configFile.value;
- executeQuery(param.value, xslFileName.value);
- formWaitMessage();
- " >
-</input>
-<hr>
-
-<!-- Font for Status Message -->
-<font face="Arial,Helvetica,Verdana" size="2" color="#FF0000">
-<div id="msg">&nbsp;</div>
-</font>
-<!-- Font End -->
-</form>
-
-</font>
-
-</body>
-</html>
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/xsl/company.xsl b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/xsl/company.xsl
deleted file mode 100644
index 99d9dc1fad..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/xsl/company.xsl
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
- Licensed 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.
- -->
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:das="http://org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <xsl:output method="html" version="1.0" encoding="Unicode" indent="yes"/>
- <xsl:template match="/root/das:DataGraphRoot">
- <html>
- <body>
- <h2>Query Result</h2>
- <xsl:apply-templates select="COMPANY"/>
- </body>
- </html>
- </xsl:template>
- <xsl:template match="COMPANY">
- <table border="1">
- <tr bgcolor="#9acd32">
- <th align="left">COMPANYID</th>
- <th align="left">COMPANYNAME</th>
- </tr>
- <tr>
- <td>
- <xsl:value-of select="ID"/>
- </td>
- <td>
- <xsl:value-of select="NAME"/>
- </td>
- </tr>
- </table>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/xsl/companyDepartment.xsl b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/xsl/companyDepartment.xsl
deleted file mode 100644
index f79d30595e..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/xsl/companyDepartment.xsl
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
- Licensed 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.
- -->
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:das="http://org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <xsl:output method="html" version="1.0" encoding="Unicode" indent="yes"/>
- <xsl:key name="companyidkey" match="/root/das:DataGraphRoot/DEPARTMENT" use="COMPANYID"/>
- <xsl:template match="/root/das:DataGraphRoot">
- <html>
- <body>
- <h2>Query Result</h2>
- <xsl:apply-templates select="COMPANY"/>
- </body>
- </html>
- </xsl:template>
- <xsl:template match="COMPANY">
- <table border="1">
- <tr bgcolor="#9acd32">
- <th align="left">COMPANYID</th>
- <th align="left">COMPANYNAME</th>
- </tr>
-
- <tr>
- <td>
- <xsl:value-of select="ID"/>
- </td>
- <td>
- <xsl:value-of select="NAME"/>
- </td>
- <table border="1">
- <tr bgcolor="#9acd32">
- <th align="left">DEPID</th>
- <th align="left">DEPNAME</th>
- </tr>
-
- <xsl:variable name="tmp" select="ID"/>
- <xsl:for-each select="key('companyidkey', $tmp)">
- <tr>
- <td>
- <xsl:value-of select="ID"/>
- </td>
- <td>
- <xsl:value-of select="NAME"/>
- </td>
- </tr>
- </xsl:for-each>
- </table>
- </tr>
- </table>
-
-</xsl:template>
-</xsl:stylesheet>
diff --git a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/xsl/customer.xsl b/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/xsl/customer.xsl
deleted file mode 100644
index 40e260bcce..0000000000
--- a/das-java/tags/1.0-incubating-beta2-rc1/samples/advanced-webapp/src/main/webapp/xsl/customer.xsl
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
- Licensed 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.
- -->
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:das="http://org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <xsl:output method="html" version="1.0" encoding="UTF-8" indent="yes"/>
- <xsl:template match="/">
- <html>
- <body>
- <h2>Query Result</h2>
- <table border="1">
- <tr bgcolor="#9acd32">
- <th align="left">ID</th>
- <th align="left">LASTNAME</th>
- <th align="left">ADDRESS</th>
- </tr>
- <xsl:for-each select="root">
- <xsl:for-each select="das:DataGraphRoot">
- <tr>
- <td>
- <xsl:value-of select="CUSTOMER/ID"/>
- </td>
- <td>
- <xsl:value-of select="CUSTOMER/LASTNAME"/>
- </td>
- <td>
- <xsl:value-of select="CUSTOMER/ADDRESS"/>
- </td>
- </tr>
- </xsl:for-each>
- </xsl:for-each>
- </table>
- </body>
- </html>
- </xsl:template>
-</xsl:stylesheet>