Skip to content

Commit

Permalink
Finished REST.
Browse files Browse the repository at this point in the history
REST Wrapper for the Generator
Java Client to make REST request to the generator
Javascript client to make REST requests to the generator
  • Loading branch information
Jonathan committed Mar 29, 2018
1 parent 9e80bfd commit 0abbf11
Show file tree
Hide file tree
Showing 10 changed files with 262 additions and 44 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
requester.onreadystatechange = function() {
if (this.readyState == 4 && this.status == 200) {
toCallOnSuccess();
} else if (this.status == 404) {
} else if (this.readyState == 4 && this.status == 404) {
document.getElementById("error").innerHTML = "The file you have requested hasn't been generated yet. Please generate them first.";
} else {
} else if (this.readyState == 4) {
document.getElementById("error").innerHTML = "An error happened during the request. HTTP Code: " + this.status;
}
};
Expand All @@ -34,9 +34,10 @@
}

function generateFiles() {
if (document.getElementById("solutionListDepths").innerHTML) {
const depths = document.getElementById("solutionListDepths").innerHTML.split(',');
let solutionsListParsed = [];
let solutionsListParsed = [];

if (document.getElementById("solutionListDepths").value) {
const depths = document.getElementById("solutionListDepths").value.split(',');

for (let i = 0; i < depths.length; i++) {
if (!isNaN(parseInt(depths[i]))) {
Expand All @@ -48,9 +49,9 @@
}

const parameters = {
numberOfConcepts: document.getElementById("numberOfConcepts").innerHTML || 10000,
numberOfServices: document.getElementById("numberOfServices").innerHTML || 4000,
solvableProblem: document.getElementById("isSolvable").innerHTML == 'true' ? true : false,
numberOfConcepts: document.getElementById("numberOfConcepts").value || 10000,
numberOfServices: document.getElementById("numberOfServices").value || 4000,
solvableProblem: document.getElementById("isSolvable").value == 'true' ? true : false,
solutionsList: solutionsListParsed
};

Expand All @@ -61,34 +62,34 @@
}

function getWSDL() {
makeRequest('GET', restAPIURL + 'gen/wsdl', undefined, function() {
window.open(restAPIURL + 'gen/wsdl', '_blank');
makeRequest('GET', restAPIURL + '/gen/wsdl', undefined, function() {
window.open(restAPIURL + '/gen/wsdl', '_blank');
});
}

function getWSLA() {
makeRequest('GET', restAPIURL + 'gen/wsla', undefined, function() {
window.open(restAPIURL + 'gen/wsla', '_blank');
makeRequest('GET', restAPIURL + '/gen/wsla', undefined, function() {
window.open(restAPIURL + '/gen/wsla', '_blank');
});
}

function getOWL() {
makeRequest('GET', restAPIURL + 'gen/owl', undefined, function() {
window.open(restAPIURL + 'gen/owl', '_blank');
makeRequest('GET', restAPIURL + '/gen/owl', undefined, function() {
window.open(restAPIURL + '/gen/owl', '_blank');
});
}

function getBPEL() {
makeRequest('GET', restAPIURL + 'gen/bpel', undefined, function() {
window.open(restAPIURL + 'gen/bpel', '_blank');
makeRequest('GET', restAPIURL + '/gen/bpel', undefined, function() {
window.open(restAPIURL + '/gen/bpel', '_blank');
});
}

function changedValue() {
if (document.getElementById("isSolvable").value == 'true') {
document.getElementById("solutionListDepths").style.display = 'block';
document.getElementById("labelSolutionDepths").style.display = 'block';
} else {
document.getElementById("solutionListDepths").style.display = 'none';
document.getElementById("labelSolutionDepths").style.display = 'none';
document.getElementById("solutionListDepths").value = '';
}
}
Expand All @@ -101,10 +102,22 @@ <h1>Javascript REST Client for WS-Gen</h1>
<h3>Parameters for the Generator</h3>
<p id="error" style="color: red;"></p>
<p id="status"></p>
<input id="numberOfConcepts" type="number"/>
<input id="numberOfServices" type="number"/>
<input id="isSolvable" type="text" onkeyup="changedValue"/>
<input id="solutionListDepths" style="display: none;" type="text"/>
<label>
Number of concepts (integer):
<input id="numberOfConcepts" type="number"/>
</label>
<label>
Number of services (integer):
<input id="numberOfServices" type="number"/>
</label>
<label>
Is solvable (true or false)
<input id="isSolvable" type="text" onkeyup="changedValue()"/>
</label>
<label id="labelSolutionDepths" style="display: none;">
Solution list depths (integer separated by ,):
<input id="solutionListDepths" type="text"/>
</label>
<button type="button" onclick="generateFiles()">Generate Files</button>
<div id="divGetFiles" style="display: none;">
<button type="button" onclick="getWSDL()">Download WSDL</button>
Expand Down
149 changes: 145 additions & 4 deletions nbproject/ant-deploy.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,150 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
Oracle and Java are registered trademarks of Oracle and/or its affiliates.
Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
Development and Distribution License("CDDL") (collectively, the
"License"). You may not use this file except in compliance with the
License. You can obtain a copy of the License at
http://www.netbeans.org/cddl-gplv2.html
or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
particular file as subject to the "Classpath" exception as provided
by Oracle in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
under the [CDDL or GPL Version 2] license." If you do not indicate a
single choice of license, a recipient has the option to distribute
your version of this file under either the CDDL, the GPL Version 2 or
to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
Contributor(s):
-->
<project default="-deploy-ant" basedir=".">
<target name="-deploy-ant" if="deploy.ant.enabled">
<fail message="Deploy is not supported for the current target server"/>
<target name="-init-cl-deployment-env" if="deploy.ant.enabled">
<property file="${deploy.ant.properties.file}" />
<available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
<available file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" property="glassfish.web.present"/>
<available file="${deploy.ant.resource.dir}" property="has.setup"/>
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
<target name="-undeploy-ant" if="deploy.ant.enabled">
<fail message="Undeploy is not supported for the current target server"/>

<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
<!-- The doctype triggers resolution which can fail -->
<replace file="${temp.sun.web}">
<replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
<replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
</replace>
<replace file="${temp.sun.web}">
<replacetoken><![CDATA[<sun-web-app]]></replacetoken>
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
</xmlproperty>
<delete file="${temp.sun.web}"/>
<condition property="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
<isset property="sun-web-app.context-root"/>
</condition>
<condition property="deploy.context.root.argument" value="&amp;contextroot=${sun-web-app.context-root}" else="/${ant.project.name}">
<isset property="sun-web-app.context-root"/>
</condition>
</target>
<target name="-parse-glassfish-web" depends="-init-cl-deployment-env" if="glassfish.web.present">
<tempfile prefix="gfv3" property="temp.gf.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" tofile="${temp.gf.web}"/>
<!-- The doctype triggers resolution which can fail -->
<replace file="${temp.gf.web}">
<replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
<replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
</replace>
<replace file="${temp.gf.web}">
<replacetoken><![CDATA[<glassfish-web-app]]></replacetoken>
<replacevalue><![CDATA[--> <glassfish-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.gf.web}" validate="false">
</xmlproperty>
<delete file="${temp.gf.web}"/>
<condition property="deploy.ant.client.url" value="${gfv3.url}${glassfish-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
<isset property="glassfish-web-app.context-root"/>
</condition>
<condition property="deploy.context.root.argument" value="&amp;contextroot=${glassfish-web-app.context-root}" else="/${ant.project.name}">
<isset property="glassfish-web-app.context-root"/>
</condition>
</target>
<target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
<property name="deploy.context.root.argument" value=""/>
</target>
<target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
<tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
<mkdir dir="${gfv3.resources.dir}"/>
<mkdir dir="${gfv3.resources.dir}/META-INF"/>
<copy todir="${gfv3.resources.dir}/META-INF">
<fileset dir="${deploy.ant.resource.dir}"/>
</copy>
<jar destfile="${deploy.ant.archive}" update="true">
<fileset dir="${gfv3.resources.dir}"/>
</jar>
<delete dir="${gfv3.resources.dir}"/>
</target>
<target name="-deploy-ant" depends="-parse-glassfish-web, -parse-sun-web, -no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
<antcall target="-deploy-without-pw"/>
<antcall target="-deploy-with-pw"/>
</target>

<target name="-deploy-without-pw" unless="gfv3.password">
<echo message="Deploying ${deploy.ant.archive}"/>
<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
<get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
dest="${gfv3.results.file}"/>
<delete file="${gfv3.results.file}"/>
</target>
<target name="-deploy-with-pw" if="gfv3.password">
<echo message="Deploying ${deploy.ant.archive}"/>
<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
<get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
dest="${gfv3.results.file}"/>
<delete file="${gfv3.results.file}"/>
</target>
<target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
<antcall target="-undeploy-without-pw"/>
<antcall target="-undeploy-with-pw"/>
</target>

<target name="-undeploy-without-pw" unless="gfv3.password">
<echo message="Undeploying ${deploy.ant.archive}"/>
<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
dest="${gfv3.results.file}"/>
<delete file="${gfv3.results.file}"/>
</target>
<target name="-undeploy-with-pw" if="gfv3.password">
<echo message="Undeploying ${deploy.ant.archive}"/>
<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
dest="${gfv3.results.file}"/>
<delete file="${gfv3.results.file}"/>
</target>
</project>
8 changes: 8 additions & 0 deletions nbproject/build-impl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
-->
<project xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" basedir=".." default="default" name="WSC09Platform-impl">
<import file="jaxws-build.xml"/>
<import file="rest-build.xml"/>
<import file="ant-deploy.xml"/>
<fail message="Please build using Ant 1.7.1 or higher.">
<condition>
Expand Down Expand Up @@ -997,6 +999,9 @@ exists or setup the property manually. For example like this:
<copyfiles files="${file.reference.xalan-2.7.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.xercesImpl-2.8.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.dom4j-1.6.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.jackson-annotations-2.9.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.jackson-core-2.9.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.jackson-databind-2.9.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<mkdir dir="${build.web.dir}/META-INF"/>
<manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
</target>
Expand All @@ -1014,6 +1019,9 @@ exists or setup the property manually. For example like this:
<copyfiles files="${file.reference.xalan-2.7.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.xercesImpl-2.8.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.dom4j-1.6.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.jackson-annotations-2.9.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.jackson-core-2.9.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.jackson-databind-2.9.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
</target>
<target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
<delete dir="${build.web.dir}/WEB-INF/lib"/>
Expand Down
14 changes: 9 additions & 5 deletions nbproject/genfiles.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
build.xml.data.CRC32=0f6fb47b
build.xml.data.CRC32=7b1a7c2c
build.xml.script.CRC32=bcdf5eca
build.xml.stylesheet.CRC32=651128d4@1.68.1.1
build.xml.stylesheet.CRC32=651128d4@1.77.1.1
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=0f6fb47b
nbproject/build-impl.xml.script.CRC32=a447f045
nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.68.1.1
nbproject/build-impl.xml.data.CRC32=7b1a7c2c
nbproject/build-impl.xml.script.CRC32=7965e830
nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.77.1.1
nbproject/rest-build.xml.data.CRC32=0ab29f81
nbproject/rest-build.xml.script.CRC32=c9ad12d8
nbproject/rest-build.xml.stylesheet.CRC32=0cfeebcc@1.31.1
nbproject/jaxws-build.xml.stylesheet.CRC32=6608c2cf
Loading

0 comments on commit 0abbf11

Please sign in to comment.