Commit 5d10a84e authored 9 years ago by Simon Spinner

Merge branch 'master' of

https://sis76cq@se3.informatik.uni-wuerzburg.de/sis76cq/prisma.git

Conflicts:
	tools.descartes.prisma.parameterization/src/tools/descartes/prisma/parameterization/Main.java

parents 540b56bf ac834bcf

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

jboss.extraction.client/pom.xml 21 additions, 1 deletion

jboss.extraction.client/pom.xml
jboss.extraction.client/src/main/java/tools/descartes/modelextraction/jboss/extraction/client/App.java 160 additions, 29 deletions

...escartes/modelextraction/jboss/extraction/client/App.java
tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/extension/ModelExtractionHandler.java 0 additions, 130 deletions

...risma/agent/wildfly/extension/ModelExtractionHandler.java
tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/extension/SubsystemDefinition.java 0 additions, 12 deletions

...s/prisma/agent/wildfly/extension/SubsystemDefinition.java
tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/interceptors/EJBIncomingCallInterceptor.java 3 additions, 1 deletion

...gent/wildfly/interceptors/EJBIncomingCallInterceptor.java
tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/interceptors/IncomingServletCallHandler.java 6 additions, 30 deletions

...gent/wildfly/interceptors/IncomingServletCallHandler.java
tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/interceptors/WebServiceIncomingInterceptor.java 20 additions, 19 deletions

...t/wildfly/interceptors/WebServiceIncomingInterceptor.java
tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/interceptors/WebServiceOutgoingInterceptor.java 2 additions, 2 deletions

...t/wildfly/interceptors/WebServiceOutgoingInterceptor.java
tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/service/ModelExtractionService.java 62 additions, 581 deletions

.../prisma/agent/wildfly/service/ModelExtractionService.java
tools.descartes.prisma.core/src/tools/descartes/prisma/core/templates/repository/AssemblyConnectorTemplate.java 2 additions, 1 deletion

.../core/templates/repository/AssemblyConnectorTemplate.java
tools.descartes.prisma.core/src/tools/descartes/prisma/core/templates/system/SystemTemplate.java 20 additions, 0 deletions

...escartes/prisma/core/templates/system/SystemTemplate.java
tools.descartes.prisma.parameterization/.gitignore 1 addition, 0 deletions

tools.descartes.prisma.parameterization/.gitignore
tools.descartes.prisma.parameterization/META-INF/MANIFEST.MF 4 additions, 1 deletion

tools.descartes.prisma.parameterization/META-INF/MANIFEST.MF
tools.descartes.prisma.parameterization/plugin.xml 12 additions, 0 deletions

tools.descartes.prisma.parameterization/plugin.xml
tools.descartes.prisma.parameterization/src/tools/descartes/prisma/parameterization/Application.java 74 additions, 8 deletions

.../tools/descartes/prisma/parameterization/Application.java
tools.descartes.prisma.parameterization/src/tools/descartes/prisma/parameterization/InputSpecificationDerivationStrategy.java 32 additions, 1 deletion

...arameterization/InputSpecificationDerivationStrategy.java
tools.descartes.prisma.parameterization/src/tools/descartes/prisma/parameterization/Main.java 203 additions, 89 deletions

...ion/src/tools/descartes/prisma/parameterization/Main.java
tools.descartes.prisma.parameterization/src/tools/descartes/prisma/parameterization/MappingModel.java 12 additions, 0 deletions

...tools/descartes/prisma/parameterization/MappingModel.java
tools.descartes.prisma.parameterization/src/tools/descartes/prisma/parameterization/OptEstimationApproach.java 221 additions, 0 deletions

...cartes/prisma/parameterization/OptEstimationApproach.java
tools.descartes.prisma.parameterization/src/tools/descartes/prisma/parameterization/SystemInterfaceInstrumentationStrategy.java 6 additions, 2 deletions

...ameterization/SystemInterfaceInstrumentationStrategy.java

with 861 additions and 907 deletions

Please register or to comment