Skip to content

Commit

Permalink
Clean up some extensions that are not used anymore.
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexJitianu committed May 7, 2020
1 parent 2fdfe44 commit 6361595
Show file tree
Hide file tree
Showing 5 changed files with 138 additions and 179 deletions.
28 changes: 0 additions & 28 deletions frameworks/xspec/oxygen-results-view/build_report.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,32 +69,6 @@
<!-- ================================== -->


<!--
Overriden target: <target name="preprocess-schematron-xspec">
Why we do this because we want to:
- apply a different XSLT ${xspec.project.dir}/oxygen-results-view/schut-to-xspec.xsl
This XSLT stores the location into the scenario before all modules are merged into one big file.
We need this for backmapping, to locate a specific scenario from the generated output.
-->

<!-- Converts Schematron XSpec into XSLT XSpec -->
<target name="preprocess-schematron-xspec"
depends="preprocess-schematron-xslt"
if="${xspec.is.schematron}">
<makeurl property="xspec.schematron.preprocessed.xsl.url"
file="${xspec.schematron.preprocessed.xsl.file}" />

<saxon-xslt in="${xspec.xspecfile.original}"
out="${xspec.xspecfile.preprocessed}"
style="${xspec.project.dir}/oxygen-results-view/schut-to-xspec.xsl">
<xslt-elements>
<param name="stylesheet-uri" expression="${xspec.schematron.preprocessed.xsl.url}" />
</xslt-elements>
</saxon-xslt>
</target>

<target name="compile" depends="init, preprocess-schematron-xspec">
<condition property="xspec.compiler.xsl"
value="generate-query-tests.xsl"
Expand All @@ -109,8 +83,6 @@
Use a custom compiler : ext.xspec.compiler.xsl
We do this because we want to:
- embed inside the compiled output backmapping information, the URL of the original XSpec
file. XSpecs can be imported into one another so we remember for each scenario the file it came from.
- control the scenario-to-template ID generation so we can request a specific scenario to run.
The ID is generated by com.oxygenxml.xspec.saxon.GenerateIDExtensionFunction. This way, from
both the compile XSLTs and the plugin's Java code we get the same IDs.
Expand Down
2 changes: 0 additions & 2 deletions frameworks/xspec/oxygen-results-view/generate-xspec-tests-oxygen.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
exclude-result-prefixes="#all"


xmlns:uuid="java:java.util.UUID"
xmlns:local="http://oxygenxml.com/local"
xmlns:string="java:java.lang.String"
>


Expand Down
13 changes: 0 additions & 13 deletions frameworks/xspec/oxygen-results-view/schut-to-xspec.xsl
View file

This file was deleted.

272 changes: 136 additions & 136 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,137 +1,137 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.oxygenxml</groupId>
<artifactId>xspec.support</artifactId>
<version>1.0-SNAPSHOT</version>

<repositories>
<repository>
<id>public</id>
<name>oXygen public artifacts</name>
<url>http://www.oxygenxml.com/maven</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>com.oxygenxml</groupId>
<artifactId>oxygen-sdk</artifactId>
<version>18.1.0.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
</dependency>
<dependency>
<groupId>net.sf.jfcunit</groupId>
<artifactId>jfcunit</artifactId>
<version>2.08</version>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant-launcher</artifactId>
<version>1.6.5</version>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.0</version>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant-trax</artifactId>
<version>1.6.5</version>
</dependency>

</dependencies>


<build>
<plugins>

<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<archiveBaseDirectory>${project.basedir}</archiveBaseDirectory>
<descriptors>
<descriptor>assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
<execution>
<id>make-framework-package</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<archiveBaseDirectory>${project.basedir}</archiveBaseDirectory>
<descriptors>
<descriptor>assembly-framework.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>


<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.2</version>
<executions>
<execution>
<id>copy-resources</id>
<!-- here the phase you need -->
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}</directory>
<includes>
<include>update_site.xml</include>
</includes>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.oxygenxml</groupId>
<artifactId>xspec.support</artifactId>
<version>1.0-SNAPSHOT</version>

<repositories>
<repository>
<id>public</id>
<name>oXygen public artifacts</name>
<url>http://www.oxygenxml.com/maven</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>com.oxygenxml</groupId>
<artifactId>oxygen-sdk</artifactId>
<version>18.1.0.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
</dependency>
<dependency>
<groupId>net.sf.jfcunit</groupId>
<artifactId>jfcunit</artifactId>
<version>2.08</version>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant-launcher</artifactId>
<version>1.6.5</version>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.0</version>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant-trax</artifactId>
<version>1.6.5</version>
</dependency>

</dependencies>


<build>
<plugins>

<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<archiveBaseDirectory>${project.basedir}</archiveBaseDirectory>
<descriptors>
<descriptor>assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
<execution>
<id>make-framework-package</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<archiveBaseDirectory>${project.basedir}</archiveBaseDirectory>
<descriptors>
<descriptor>assembly-framework.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>


<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.2</version>
<executions>
<execution>
<id>copy-resources</id>
<!-- here the phase you need -->
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}</directory>
<includes>
<include>update_site.xml</include>
</includes>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
2 changes: 2 additions & 0 deletions src/test/java/com/oxygenxml/xspec/jfx/XSpecViewTestBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;

import org.junit.Ignore;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
Expand All @@ -37,6 +38,7 @@
import ro.sync.exml.workspace.api.util.UtilAccess;
import ro.sync.util.URLUtil;

@Ignore
public class XSpecViewTestBase extends JFCTestCase {

/**
Expand Down

0 comments on commit 6361595

Please sign in to comment.