Merge pull request #3 from Recipebank/master

04/11/2013Merge from group repo
Web Services Project Update
Merge pull request #9 from janiswukong/Code-in-WebSerices-Part

Web Services Project Update
Merge pull request #4 from Recipebank/Webservice_Part

Webservice part pull from recipebank 05/11/2013
Github note update
Create class Recipe and create the method for view detail and search
recipe
Merge pull request #10 from sorafeng/WebService

Create class recipe and method for view recipe detail and search recipe
Update the class recipe, recipebankDB

Create the test client for weservice/recipe
Update the database
Merge pull request #11 from sorafeng/WebService

Update the class recipe, recipebankDB
Merge remote-tracking branch 'origin/Webservice_Part'

Conflicts:
	RecipeBankWebServices/.gitignore
	RecipeBankWebServices/.project
	RecipeBankWebServices/.settings/.jsdtscope
	RecipeBankWebServices/.settings/org.eclipse.jdt.core.prefs
	RecipeBankWebServices/.settings/org.eclipse.wst.common.component
	RecipeBankWebServices/.settings/org.eclipse.wst.common.project.facet.core.xml
	RecipeBankWebServices/.settings/org.eclipse.wst.validation.prefs
	RecipeBankWebServices/WebContent/META-INF/MANIFEST.MF
	RecipeBankWebServices/WebContent/WEB-INF/classes/META-INF/LICENSE
	RecipeBankWebServices/WebContent/WEB-INF/classes/META-INF/NOTICE
	RecipeBankWebServices/WebContent/WEB-INF/classes/commons-logging.properties
	RecipeBankWebServices/WebContent/WEB-INF/classes/log4j.properties
	RecipeBankWebServices/WebContent/WEB-INF/conf/axis2.policy
	RecipeBankWebServices/WebContent/WEB-INF/conf/axis2.xml
	RecipeBankWebServices/WebContent/WEB-INF/conf/commons-logging.properties
	RecipeBankWebServices/WebContent/WEB-INF/conf/log4j.properties
	RecipeBankWebServices/WebContent/WEB-INF/lib/XmlSchema-LICENSE.txt
	RecipeBankWebServices/WebContent/WEB-INF/lib/activation-LICENSE.txt
	RecipeBankWebServices/WebContent/WEB-INF/lib/antlr-2-LICENSE.txt
	RecipeBankWebServices/WebContent/WEB-INF/lib/axiom-api-LICENSE.txt
	RecipeBankWebServices/WebContent/WEB-INF/lib/axiom-dom-LICENSE.txt
	RecipeBankWebServices/WebContent/WEB-INF/lib/axiom-impl-LICENSE.txt
	RecipeBankWebServices/WebContent/WEB-INF/lib/axis2-LICENSE.txt
	RecipeBankWebServices/WebContent/WEB-INF/lib/commons-cli-LICENSE.txt
	RecipeBankWebServices/WebContent/WEB-INF/lib/commons-codec-LICENSE.txt
	RecipeBankWebServices/WebContent/WEB-INF/lib/commons-fileupload-LICENSE.txt
	RecipeBankWebServices/WebContent/WEB-INF/lib/commons-httpclient-LICENSE.txt
	RecipeBankWebServices/WebContent/WEB-INF/lib/commons-io-LICENSE.txt
	RecipeBankWebServices/WebContent/WEB-INF/lib/commons-logging-LICENSE.txt
	RecipeBankWebServices/WebContent/WEB-INF/lib/httpcore-LICENSE.txt
	RecipeBankWebServices/WebContent/WEB-INF/lib/log4j-LICENSE.txt
	RecipeBankWebServices/WebContent/WEB-INF/lib/mail-LICENSE.txt
	RecipeBankWebServices/WebContent/WEB-INF/lib/neethi-LICENSE.txt
	RecipeBankWebServices/WebContent/WEB-INF/lib/woden-api-LICENSE.txt
	RecipeBankWebServices/WebContent/WEB-INF/lib/woden-impl-commons-LICENSE.txt
	RecipeBankWebServices/WebContent/WEB-INF/lib/woden-impl-dom-LICENSE.txt
	RecipeBankWebServices/WebContent/WEB-INF/lib/wsdl4j-LICENSE.txt
	RecipeBankWebServices/WebContent/WEB-INF/lib/wstx-LICENSE.txt
	RecipeBankWebServices/WebContent/WEB-INF/lib/xmlbeans-LICENSE.txt
	RecipeBankWebServices/WebContent/WEB-INF/modules/modules.list
	RecipeBankWebServices/WebContent/WEB-INF/services/Category/META-INF/services.xml
	RecipeBankWebServices/WebContent/WEB-INF/services/Recipe/META-INF/services.xml
	RecipeBankWebServices/WebContent/WEB-INF/services/services.list
	RecipeBankWebServices/WebContent/WEB-INF/web.xml
	RecipeBankWebServices/WebContent/axis2-web/ActivateService.jsp
	RecipeBankWebServices/WebContent/axis2-web/EngageToServiceGroup.jsp
	RecipeBankWebServices/WebContent/axis2-web/Error/AuthError.html
	RecipeBankWebServices/WebContent/axis2-web/Error/GenError.html
	RecipeBankWebServices/WebContent/axis2-web/Error/error404.jsp
	RecipeBankWebServices/WebContent/axis2-web/Error/error500.jsp
	RecipeBankWebServices/WebContent/axis2-web/HappyAxis.jsp
	RecipeBankWebServices/WebContent/axis2-web/InActivateService.jsp
	RecipeBankWebServices/WebContent/axis2-web/LeftFrame.jsp
	RecipeBankWebServices/WebContent/axis2-web/ListServiceGroup.jsp
	RecipeBankWebServices/WebContent/axis2-web/MainFrame.jsp
	RecipeBankWebServices/WebContent/axis2-web/SelectService.jsp
	RecipeBankWebServices/WebContent/axis2-web/ServiceParaEdit.jsp
	RecipeBankWebServices/WebContent/axis2-web/TopFrame.jsp
	RecipeBankWebServices/WebContent/axis2-web/ViewContexts.jsp
	RecipeBankWebServices/WebContent/axis2-web/ViewGlobalHandlers.jsp
	RecipeBankWebServices/WebContent/axis2-web/ViewServiceHandlers.jsp
	RecipeBankWebServices/WebContent/axis2-web/admin.jsp
	RecipeBankWebServices/WebContent/axis2-web/css/axis-style.css
	RecipeBankWebServices/WebContent/axis2-web/deleteService.jsp
	RecipeBankWebServices/WebContent/axis2-web/disengage.jsp
	RecipeBankWebServices/WebContent/axis2-web/engagingglobally.jsp
	RecipeBankWebServices/WebContent/axis2-web/engagingtoanoperation.jsp
	RecipeBankWebServices/WebContent/axis2-web/engagingtoaservice.jsp
	RecipeBankWebServices/WebContent/axis2-web/error.jsp
	RecipeBankWebServices/WebContent/axis2-web/errorModule.jsp
	RecipeBankWebServices/WebContent/axis2-web/globalModules.jsp
	RecipeBankWebServices/WebContent/axis2-web/include/adminfooter.inc
	RecipeBankWebServices/WebContent/axis2-web/include/adminheader.inc
	RecipeBankWebServices/WebContent/axis2-web/include/adminheader.jsp
	RecipeBankWebServices/WebContent/axis2-web/include/footer.inc
	RecipeBankWebServices/WebContent/axis2-web/include/header.inc
	RecipeBankWebServices/WebContent/axis2-web/include/httpbase.jsp
	RecipeBankWebServices/WebContent/axis2-web/include/link-footer.inc
	RecipeBankWebServices/WebContent/axis2-web/include/link-footer.jsp
	RecipeBankWebServices/WebContent/axis2-web/index.jsp
	RecipeBankWebServices/WebContent/axis2-web/listFaultyService.jsp
	RecipeBankWebServices/WebContent/axis2-web/listGroupService.jsp
	RecipeBankWebServices/WebContent/axis2-web/listModules.jsp
	RecipeBankWebServices/WebContent/axis2-web/listService.jsp
	RecipeBankWebServices/WebContent/axis2-web/listServices.jsp
	RecipeBankWebServices/WebContent/axis2-web/listSingleService.jsp
	RecipeBankWebServices/WebContent/axis2-web/upload.jsp
	RecipeBankWebServices/WebContent/axis2-web/viewServiceContext.jsp
	RecipeBankWebServices/WebContent/axis2-web/viewServiceGroupContext.jsp
	RecipeBankWebServices/WebContent/axis2-web/viewphases.jsp
	RecipeBankWebServices/build.xml
	RecipeBankWebServices/src/com/rb/testClient/CategoryCallbackHandler.java
	RecipeBankWebServices/src/com/rb/testClient/CategoryStub.java
	RecipeBankWebServices/src/com/rb/testClient/RecipeCallbackHandler.java
	RecipeBankWebServices/src/com/rb/testClient/RecipeClient.java
	RecipeBankWebServices/src/com/rb/testClient/RecipeStub.java
	RecipeBankWebServices/src/com/rb/util/ConnectDB.java
	RecipeBankWebServices/src/com/rb/util/ProduceJSON.java
	RecipeBankWebServices/src/com/rb/webServices/Category.java