Mas Cambios
Mas Cambios
Mas Cambios
Mas Cambios
Merge branch 'master' of https://github.com/franbn14/SORPAPETEAM

Conflicts:
	.gitignore
	SorAMQ/src/soramq/AMQFunctions.java
	SorAMQ/src/soramq/AMQPublisher.java
	Sor_Servicios/nbproject/jaxws-build.xml
	Taller/catalog.xml
	Taller/nbproject/jax-ws.xml
	Taller/nbproject/jaxws-build.xml
	Taller/nbproject/project.xml
	Taller/src/CEN/OfferCEN.java
	Taller/src/CEN/RequestCEN.java
	Taller/src/META-INF/LoginClientes.xml
	Taller/src/META-INF/jax-ws-catalog.xml

Taller/src/META-INF/wsdl/localhost_8080/Sor_Servicios/LoginClientes.wsdl

Taller/src/META-INF/wsdl/localhost_8080/Sor_Servicios/LoginClientes.xsd_
1.xsd

Taller/src/META-INF/wsdl/localhost_8081/Sor_Servicios/LoginClientes.wsdl

Taller/src/META-INF/wsdl/localhost_8081/Sor_Servicios/LoginClientes.xsd_
1.xsd
	Taller/src/META-INF/wsit-client.xml
	Taller/src/taller/Home.form
	Taller/src/taller/Home.java
	Taller/src/taller/Main.form
	Taller/src/taller/Main.java
	Taller/src/taller/NewRequest.form
	Taller/src/taller/NewRequest.java
	Taller/src/taller/Register.form
	Taller/src/taller/Register.java

Taller/xml-resources/web-service-references/LoginClientes/wsdl/localhost
_8080/Sor_Servicios/LoginClientes.wsdl

Taller/xml-resources/web-service-references/LoginClientes/wsdl/localhost
_8080/Sor_Servicios/LoginClientes.xsd_1.xsd