Diego avance
Merge branch 'master' of https://github.com/misouniandes/isis2603-grupo3

Conflicts:

client.service.subsystem.web/target/classes/META-INF/glassfish-resources
.xml

client.service.subsystem.web/target/classes/co/edu/uniandes/csw/client/s
ervice/ClientService.class

client.service.subsystem.web/target/classes/co/edu/uniandes/csw/client/s
ervice/_ClientService.class

client.service.subsystem.web/target/client.service.subsystem.web-0.0.1-S
NAPSHOT.war

client.service.subsystem.web/target/client.service.subsystem.web-0.0.1-S
NAPSHOT/WEB-INF/classes/META-INF/glassfish-resources.xml

client.service.subsystem.web/target/client.service.subsystem.web-0.0.1-S
NAPSHOT/WEB-INF/lib/client.service.subsystem-0.0.1-SNAPSHOT.jar
	client.service.subsystem.web/target/maven-archiver/pom.properties
	client.service.subsystem/target/classes/META-INF/_persistence.xml
	client.service.subsystem/target/classes/META-INF/beans.xml
	client.service.subsystem/target/classes/META-INF/persistence.xml

client.service.subsystem/target/classes/co/edu/uniandes/csw/client/logic
/api/_IClientLogicService.class

client.service.subsystem/target/classes/co/edu/uniandes/csw/client/logic
/dto/_ClientDTO.class

client.service.subsystem/target/classes/co/edu/uniandes/csw/client/logic
/ejb/ClientLogicService.class

client.service.subsystem/target/classes/co/edu/uniandes/csw/client/logic
/ejb/_ClientLogicService.class

client.service.subsystem/target/classes/co/edu/uniandes/csw/client/logic
/mock/ClientMockLogicService.class

client.service.subsystem/target/classes/co/edu/uniandes/csw/client/persi
stence/ClientPersistence.class

client.service.subsystem/target/classes/co/edu/uniandes/csw/client/persi
stence/_ClientPersistence.class

client.service.subsystem/target/classes/co/edu/uniandes/csw/client/persi
stence/api/_IClientPersistence.class

client.service.subsystem/target/classes/co/edu/uniandes/csw/client/persi
stence/entity/ClientEntity.class

client.service.subsystem/target/classes/co/edu/uniandes/csw/client/persi
stence/entity/_ClientEntity.class

client.service.subsystem/target/client.service.subsystem-0.0.1-SNAPSHOT.
jar
	client.service.subsystem/target/maven-archiver/pom.properties

client.service.subsystem/target/surefire-reports/co.edu.uniandes.csw.cli
ent.logic.ejb.ClientLogicServiceTest.txt

client.service.subsystem/target/test-classes/co/edu/uniandes/csw/client/
logic/ejb/ClientLogicServiceTest.class

client.service.subsystem/target/test-classes/co/edu/uniandes/csw/client/
persistence/ClientPersistenceTest.class
	client.web/target/client.web-0.0.1-SNAPSHOT.war
	client.web/target/client.web-0.0.1-SNAPSHOT/src/model/_clientModel.js

client.web/target/client.web-0.0.1-SNAPSHOT/src/view/clientTemplates.htm
l
	client.web/target/maven-archiver/pom.properties

product.service.subsystem.web/target/classes/META-INF/glassfish-resource
s.xml

product.service.subsystem.web/target/classes/co/edu/uniandes/csw/product
/service/ProductService.class

product.service.subsystem.web/target/classes/co/edu/uniandes/csw/product
/service/_ProductService.class
	product.service.subsystem.web/target/maven-archiver/pom.properties

product.service.subsystem.web/target/product.service.subsystem.web-0.0.1
-SNAPSHOT.war

product.service.subsystem.web/target/product.service.subsystem.web-0.0.1
-SNAPSHOT/WEB-INF/classes/META-INF/glassfish-resources.xml

product.service.subsystem.web/target/product.service.subsystem.web-0.0.1
-SNAPSHOT/WEB-INF/lib/product.service.subsystem-0.0.1-SNAPSHOT.jar
	product.service.subsystem/target/classes/META-INF/_persistence.xml
	product.service.subsystem/target/classes/META-INF/beans.xml
	product.service.subsystem/target/classes/META-INF/persistence.xml

product.service.subsystem/target/classes/co/edu/uniandes/csw/product/log
ic/api/_IProductLogicService.class

product.service.subsystem/target/classes/co/edu/uniandes/csw/product/log
ic/dto/_ProductDTO.class

product.service.subsystem/target/classes/co/edu/uniandes/csw/product/log
ic/ejb/ProductLogicService.class

product.service.subsystem/target/classes/co/edu/uniandes/csw/product/log
ic/ejb/_ProductLogicService.class

product.service.subsystem/target/classes/co/edu/uniandes/csw/product/log
ic/mock/ProductMockLogicService.class

product.service.subsystem/target/classes/co/edu/uniandes/csw/product/per
sistence/ProductPersistence.class

product.service.subsystem/target/classes/co/edu/uniandes/csw/product/per
sistence/_ProductPersistence.class

product.service.subsystem/target/classes/co/edu/uniandes/csw/product/per
sistence/api/_IProductPersistence.class

product.service.subsystem/target/classes/co/edu/uniandes/csw/product/per
sistence/entity/ProductEntity.class

product.service.subsystem/target/classes/co/edu/uniandes/csw/product/per
sistence/entity/_ProductEntity.class
	product.service.subsystem/target/maven-archiver/pom.properties

product.service.subsystem/target/product.service.subsystem-0.0.1-SNAPSHO
T.jar

product.service.subsystem/target/surefire-reports/co.edu.uniandes.csw.pr
oduct.logic.ejb.ProductLogicServiceTest.txt

product.service.subsystem/target/test-classes/co/edu/uniandes/csw/produc
t/logic/ejb/ProductLogicServiceTest.class

product.service.subsystem/target/test-classes/co/edu/uniandes/csw/produc
t/persistence/ProductPersistenceTest.class
	product.web/target/maven-archiver/pom.properties
	product.web/target/product.web-0.0.1-SNAPSHOT.war

product.web/target/product.web-0.0.1-SNAPSHOT/src/model/_productModel.js

product.web/target/product.web-0.0.1-SNAPSHOT/src/view/productTemplates.
html

pyme.master.service.subsystem/target/classes/co/edu/uniandes/csw/pyme/ma
ster/logic/ejb/PymeMasterLogicService.class

pyme.master.service.subsystem/target/classes/co/edu/uniandes/csw/pyme/ma
ster/logic/ejb/_PymeMasterLogicService.class

pyme.master.service.subsystem/target/classes/co/edu/uniandes/csw/pyme/ma
ster/persistence/PymeMasterPersistence.class

pyme.master.service.subsystem/target/classes/co/edu/uniandes/csw/pyme/ma
ster/persistence/_PymeMasterPersistence.class

pyme.master.service.subsystem/target/classes/co/edu/uniandes/csw/pyme/ma
ster/persistence/entity/PymeClientEntity.class

pyme.master.service.subsystem/target/classes/co/edu/uniandes/csw/pyme/ma
ster/persistence/entity/PymeProductEntity.class

pyme.master.service.subsystem/target/classes/co/edu/uniandes/csw/pyme/ma
ster/service/PymeMasterService.class

pyme.master.service.subsystem/target/classes/co/edu/uniandes/csw/pyme/ma
ster/service/_PymeMasterService.class

pyme.service.subsystem.web/target/classes/META-INF/glassfish-resources.x
ml

pyme.service.subsystem.web/target/classes/co/edu/uniandes/csw/pyme/servi
ce/PymeService.class

pyme.service.subsystem.web/target/classes/co/edu/uniandes/csw/pyme/servi
ce/_PymeService.class
	pyme.service.subsystem.web/target/maven-archiver/pom.properties

pyme.service.subsystem.web/target/pyme.service.subsystem.web-0.0.1-SNAPS
HOT.war

pyme.service.subsystem.web/target/pyme.service.subsystem.web-0.0.1-SNAPS
HOT/WEB-INF/classes/META-INF/glassfish-resources.xml

pyme.service.subsystem.web/target/pyme.service.subsystem.web-0.0.1-SNAPS
HOT/WEB-INF/lib/pyme.service.subsystem-0.0.1-SNAPSHOT.jar
	pyme.service.subsystem/target/classes/META-INF/_persistence.xml
	pyme.service.subsystem/target/classes/META-INF/beans.xml
	pyme.service.subsystem/target/classes/META-INF/persistence.xml

pyme.service.subsystem/target/classes/co/edu/uniandes/csw/pyme/logic/api
/_IPymeLogicService.class

pyme.service.subsystem/target/classes/co/edu/uniandes/csw/pyme/logic/dto
/_PymeDTO.class

pyme.service.subsystem/target/classes/co/edu/uniandes/csw/pyme/logic/ejb
/PymeLogicService.class

pyme.service.subsystem/target/classes/co/edu/uniandes/csw/pyme/logic/ejb
/_PymeLogicService.class

pyme.service.subsystem/target/classes/co/edu/uniandes/csw/pyme/logic/moc
k/PymeMockLogicService.class

pyme.service.subsystem/target/classes/co/edu/uniandes/csw/pyme/persisten
ce/PymePersistence.class

pyme.service.subsystem/target/classes/co/edu/uniandes/csw/pyme/persisten
ce/_PymePersistence.class

pyme.service.subsystem/target/classes/co/edu/uniandes/csw/pyme/persisten
ce/api/_IPymePersistence.class

pyme.service.subsystem/target/classes/co/edu/uniandes/csw/pyme/persisten
ce/converter/_PymeConverter.class

pyme.service.subsystem/target/classes/co/edu/uniandes/csw/pyme/persisten
ce/entity/PymeEntity.class

pyme.service.subsystem/target/classes/co/edu/uniandes/csw/pyme/persisten
ce/entity/_PymeEntity.class
	pyme.service.subsystem/target/maven-archiver/pom.properties
	pyme.service.subsystem/target/pyme.service.subsystem-0.0.1-SNAPSHOT.jar

pyme.service.subsystem/target/surefire-reports/co.edu.uniandes.csw.pyme.
logic.ejb.PymeLogicServiceTest.txt

pyme.service.subsystem/target/test-classes/co/edu/uniandes/csw/pyme/logi
c/ejb/PymeLogicServiceTest.class

pyme.service.subsystem/target/test-classes/co/edu/uniandes/csw/pyme/pers
istence/PymePersistenceTest.class
	pyme.web/target/maven-archiver/pom.properties
	pyme.web/target/pyme.web-0.0.1-SNAPSHOT.war
	pyme.web/target/pyme.web-0.0.1-SNAPSHOT/src/model/_pymeModel.js
	pyme.web/target/pyme.web-0.0.1-SNAPSHOT/src/view/pymeTemplates.html