This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/wrong-packages
in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git
commit 48df4c98e869ceb0108d00b8292132d59b9a23bc
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Fri Aug 8 08:26:52 2025 +0200
Addresses problem with wrong packages in generated code
There are over 70 such warning as below
Wrong package statement:
src/main/java/com/intellij/struts2/ognl/psi/impl/OgnlPsiUtil.java#L16
Package name 'com.intellij.lang.ognl.psi.impl' does not correspond to the
file path 'com.intellij.struts2.ognl.psi.impl'
---
CHANGELOG.md | 6 ++++++
CLAUDE.md | 2 ++
src/main/gen/{ => com/intellij/lang/ognl}/OgnlIcons.java | 0
src/main/gen/{ => com/intellij/lang/ognl}/OgnlTypes.java | 0
src/main/gen/{ => com/intellij/lang/ognl}/lexer/_OgnlLexer.java | 0
src/main/gen/{ => com/intellij/lang/ognl}/parser/OgnlParser.java | 0
.../gen/{ => com/intellij/lang/ognl}/psi/OgnlBinaryExpression.java | 0
.../{ => com/intellij/lang/ognl}/psi/OgnlConditionalExpression.java | 0
src/main/gen/{ => com/intellij/lang/ognl}/psi/OgnlExpression.java | 0
.../gen/{ => com/intellij/lang/ognl}/psi/OgnlFqnTypeExpression.java | 0
.../gen/{ => com/intellij/lang/ognl}/psi/OgnlIndexedExpression.java | 0
.../gen/{ => com/intellij/lang/ognl}/psi/OgnlLambdaExpression.java | 0
.../gen/{ => com/intellij/lang/ognl}/psi/OgnlLiteralExpression.java | 0
.../gen/{ => com/intellij/lang/ognl}/psi/OgnlMapEntryElement.java | 0
.../gen/{ => com/intellij/lang/ognl}/psi/OgnlMapExpression.java | 0
.../{ => com/intellij/lang/ognl}/psi/OgnlMethodCallExpression.java | 0
.../{ => com/intellij/lang/ognl}/psi/OgnlNewArrayExpression.java | 0
.../gen/{ => com/intellij/lang/ognl}/psi/OgnlNewExpression.java | 0
.../gen/{ => com/intellij/lang/ognl}/psi/OgnlParameterList.java | 0
.../intellij/lang/ognl}/psi/OgnlParenthesizedExpression.java | 0
.../{ => com/intellij/lang/ognl}/psi/OgnlProjectionExpression.java | 0
.../{ => com/intellij/lang/ognl}/psi/OgnlReferenceExpression.java | 0
.../{ => com/intellij/lang/ognl}/psi/OgnlSelectionExpression.java | 0
.../{ => com/intellij/lang/ognl}/psi/OgnlSequenceExpression.java | 0
.../gen/{ => com/intellij/lang/ognl}/psi/OgnlUnaryExpression.java | 0
.../intellij/lang/ognl}/psi/OgnlVariableAssignmentExpression.java | 0
.../{ => com/intellij/lang/ognl}/psi/OgnlVariableExpression.java | 0
src/main/gen/{ => com/intellij/lang/ognl}/psi/OgnlVisitor.java | 0
.../intellij/lang/ognl}/psi/impl/OgnlBinaryExpressionImpl.java | 0
.../intellij/lang/ognl}/psi/impl/OgnlConditionalExpressionImpl.java | 0
.../{ => com/intellij/lang/ognl}/psi/impl/OgnlExpressionImpl.java | 0
.../intellij/lang/ognl}/psi/impl/OgnlFqnTypeExpressionImpl.java | 0
.../intellij/lang/ognl}/psi/impl/OgnlIndexedExpressionImpl.java | 0
.../intellij/lang/ognl}/psi/impl/OgnlLambdaExpressionImpl.java | 0
.../intellij/lang/ognl}/psi/impl/OgnlLiteralExpressionImpl.java | 0
.../intellij/lang/ognl}/psi/impl/OgnlMapEntryElementImpl.java | 0
.../intellij/lang/ognl}/psi/impl/OgnlMapExpressionImpl.java | 0
.../intellij/lang/ognl}/psi/impl/OgnlMethodCallExpressionImpl.java | 0
.../intellij/lang/ognl}/psi/impl/OgnlNewArrayExpressionImpl.java | 0
.../intellij/lang/ognl}/psi/impl/OgnlNewExpressionImpl.java | 0
.../intellij/lang/ognl}/psi/impl/OgnlParameterListImpl.java | 0
.../lang/ognl}/psi/impl/OgnlParenthesizedExpressionImpl.java | 0
.../intellij/lang/ognl}/psi/impl/OgnlProjectionExpressionImpl.java | 0
.../intellij/lang/ognl}/psi/impl/OgnlReferenceExpressionImpl.java | 0
.../intellij/lang/ognl}/psi/impl/OgnlSelectionExpressionImpl.java | 0
.../intellij/lang/ognl}/psi/impl/OgnlSequenceExpressionImpl.java | 0
.../intellij/lang/ognl}/psi/impl/OgnlUnaryExpressionImpl.java | 0
.../lang/ognl}/psi/impl/OgnlVariableAssignmentExpressionImpl.java | 0
.../intellij/lang/ognl}/psi/impl/OgnlVariableExpressionImpl.java | 0
src/main/java/com/intellij/{struts2 => lang}/ognl/OgnlFile.java | 0
src/main/java/com/intellij/{struts2 => lang}/ognl/OgnlFileType.java | 0
src/main/java/com/intellij/{struts2 => lang}/ognl/OgnlLanguage.java | 0
.../com/intellij/{struts2 => lang}/ognl/OgnlLanguageInjector.java | 0
.../com/intellij/{struts2 => lang}/ognl/OgnlParserDefinition.java | 0
.../ognl/completion/OgnlKeywordCompletionContributor.java | 0
.../com/intellij/{struts2 => lang}/ognl/formatting/OgnlBlock.java | 0
.../ognl/formatting/OgnlFormattingModelBuilder.java | 0
.../intellij/{struts2 => lang}/ognl/highlight/OgnlBraceMatcher.java | 0
.../{struts2 => lang}/ognl/highlight/OgnlColorSettingsPage.java | 0
.../intellij/{struts2 => lang}/ognl/highlight/OgnlHighlighter.java | 0
.../{struts2 => lang}/ognl/highlight/OgnlHighlightingAnnotator.java | 0
.../{struts2 => lang}/ognl/highlight/OgnlHighlightingLexer.java | 0
.../intellij/{struts2 => lang}/ognl/highlight/OgnlQuoteHandler.java | 0
.../java/com/intellij/{struts2 => lang}/ognl/lexer/OgnlLexer.java | 0
src/main/java/com/intellij/{struts2 => lang}/ognl/package-info.java | 0
.../java/com/intellij/{struts2 => lang}/ognl/psi/OgnlKeyword.java | 0
.../{struts2 => lang}/ognl/psi/OgnlPsiCompositeElement.java | 0
.../com/intellij/{struts2 => lang}/ognl/psi/OgnlTokenGroups.java | 0
.../java/com/intellij/{struts2 => lang}/ognl/psi/OgnlTokenType.java | 0
.../{struts2 => lang}/ognl/psi/impl/OgnlFqnTypeExpressionBase.java | 0
.../ognl/psi/impl/OgnlPsiCompositeElementBase.java | 0
.../com/intellij/{struts2 => lang}/ognl/psi/impl/OgnlPsiUtil.java | 0
.../ognl/psi/impl/OgnlReferenceExpressionBase.java | 0
.../{struts2 => lang}/ognl/psi/impl/OgnlVariableExpressionBase.java | 0
.../ognl/psi/manipulators/OgnlFqnTypeExpressionManipulator.java | 0
.../{struts2 => lang}/ognl/psi/resolve/OgnlResolveUtil.java | 0
.../resolve/variable/OgnlDefaultVariableReferencesContributor.java | 0
.../ognl/psi/resolve/variable/OgnlVariableReference.java | 0
.../psi/resolve/variable/OgnlVariableReferencesContributor.java | 0
.../ognl/spellchecker/OgnlSpellcheckingStrategy.java | 0
80 files changed, 8 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66831b7..44672a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,12 @@
- Fix `WebUtilImpl.isWebFacetConfigurationContainingFiles` API compatibility
issue for IntelliJ 2024.2
- Dependencies - upgrade `org.jetbrains.intellij.platform` to `2.7.0`
+### Fixed
+
+- Fix package naming inconsistencies - moved OGNL language support files from
`com.intellij.struts2.ognl` to correct `com.intellij.lang.ognl` package
structure
+- Resolve compilation errors caused by mismatched package declarations and
file paths
+- Restructure generated OGNL parser/lexer files to match their declared
packages
+
### Added
- [WW-5558](https://issues.apache.org/jira/browse/WW-5558) Support for new
Struts 7 packages
diff --git a/CLAUDE.md b/CLAUDE.md
index b0320f9..216f5d2 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -113,6 +113,8 @@ IntelliJ Version Mapping:
- 241.x = IntelliJ IDEA 2024.1
- 242.x = IntelliJ IDEA 2024.2
- 243.x = IntelliJ IDEA 2024.3
+- 251.x = IntelliJ IDEA 2025.1
+- 252.x = IntelliJ IDEA 2025.2
This versioning ensures plugin compatibility with specific IntelliJ Platform
versions and helps users identify which IDE version the plugin supports.
diff --git a/src/main/gen/OgnlIcons.java
b/src/main/gen/com/intellij/lang/ognl/OgnlIcons.java
similarity index 100%
rename from src/main/gen/OgnlIcons.java
rename to src/main/gen/com/intellij/lang/ognl/OgnlIcons.java
diff --git a/src/main/gen/OgnlTypes.java
b/src/main/gen/com/intellij/lang/ognl/OgnlTypes.java
similarity index 100%
rename from src/main/gen/OgnlTypes.java
rename to src/main/gen/com/intellij/lang/ognl/OgnlTypes.java
diff --git a/src/main/gen/lexer/_OgnlLexer.java
b/src/main/gen/com/intellij/lang/ognl/lexer/_OgnlLexer.java
similarity index 100%
rename from src/main/gen/lexer/_OgnlLexer.java
rename to src/main/gen/com/intellij/lang/ognl/lexer/_OgnlLexer.java
diff --git a/src/main/gen/parser/OgnlParser.java
b/src/main/gen/com/intellij/lang/ognl/parser/OgnlParser.java
similarity index 100%
rename from src/main/gen/parser/OgnlParser.java
rename to src/main/gen/com/intellij/lang/ognl/parser/OgnlParser.java
diff --git a/src/main/gen/psi/OgnlBinaryExpression.java
b/src/main/gen/com/intellij/lang/ognl/psi/OgnlBinaryExpression.java
similarity index 100%
rename from src/main/gen/psi/OgnlBinaryExpression.java
rename to src/main/gen/com/intellij/lang/ognl/psi/OgnlBinaryExpression.java
diff --git a/src/main/gen/psi/OgnlConditionalExpression.java
b/src/main/gen/com/intellij/lang/ognl/psi/OgnlConditionalExpression.java
similarity index 100%
rename from src/main/gen/psi/OgnlConditionalExpression.java
rename to src/main/gen/com/intellij/lang/ognl/psi/OgnlConditionalExpression.java
diff --git a/src/main/gen/psi/OgnlExpression.java
b/src/main/gen/com/intellij/lang/ognl/psi/OgnlExpression.java
similarity index 100%
rename from src/main/gen/psi/OgnlExpression.java
rename to src/main/gen/com/intellij/lang/ognl/psi/OgnlExpression.java
diff --git a/src/main/gen/psi/OgnlFqnTypeExpression.java
b/src/main/gen/com/intellij/lang/ognl/psi/OgnlFqnTypeExpression.java
similarity index 100%
rename from src/main/gen/psi/OgnlFqnTypeExpression.java
rename to src/main/gen/com/intellij/lang/ognl/psi/OgnlFqnTypeExpression.java
diff --git a/src/main/gen/psi/OgnlIndexedExpression.java
b/src/main/gen/com/intellij/lang/ognl/psi/OgnlIndexedExpression.java
similarity index 100%
rename from src/main/gen/psi/OgnlIndexedExpression.java
rename to src/main/gen/com/intellij/lang/ognl/psi/OgnlIndexedExpression.java
diff --git a/src/main/gen/psi/OgnlLambdaExpression.java
b/src/main/gen/com/intellij/lang/ognl/psi/OgnlLambdaExpression.java
similarity index 100%
rename from src/main/gen/psi/OgnlLambdaExpression.java
rename to src/main/gen/com/intellij/lang/ognl/psi/OgnlLambdaExpression.java
diff --git a/src/main/gen/psi/OgnlLiteralExpression.java
b/src/main/gen/com/intellij/lang/ognl/psi/OgnlLiteralExpression.java
similarity index 100%
rename from src/main/gen/psi/OgnlLiteralExpression.java
rename to src/main/gen/com/intellij/lang/ognl/psi/OgnlLiteralExpression.java
diff --git a/src/main/gen/psi/OgnlMapEntryElement.java
b/src/main/gen/com/intellij/lang/ognl/psi/OgnlMapEntryElement.java
similarity index 100%
rename from src/main/gen/psi/OgnlMapEntryElement.java
rename to src/main/gen/com/intellij/lang/ognl/psi/OgnlMapEntryElement.java
diff --git a/src/main/gen/psi/OgnlMapExpression.java
b/src/main/gen/com/intellij/lang/ognl/psi/OgnlMapExpression.java
similarity index 100%
rename from src/main/gen/psi/OgnlMapExpression.java
rename to src/main/gen/com/intellij/lang/ognl/psi/OgnlMapExpression.java
diff --git a/src/main/gen/psi/OgnlMethodCallExpression.java
b/src/main/gen/com/intellij/lang/ognl/psi/OgnlMethodCallExpression.java
similarity index 100%
rename from src/main/gen/psi/OgnlMethodCallExpression.java
rename to src/main/gen/com/intellij/lang/ognl/psi/OgnlMethodCallExpression.java
diff --git a/src/main/gen/psi/OgnlNewArrayExpression.java
b/src/main/gen/com/intellij/lang/ognl/psi/OgnlNewArrayExpression.java
similarity index 100%
rename from src/main/gen/psi/OgnlNewArrayExpression.java
rename to src/main/gen/com/intellij/lang/ognl/psi/OgnlNewArrayExpression.java
diff --git a/src/main/gen/psi/OgnlNewExpression.java
b/src/main/gen/com/intellij/lang/ognl/psi/OgnlNewExpression.java
similarity index 100%
rename from src/main/gen/psi/OgnlNewExpression.java
rename to src/main/gen/com/intellij/lang/ognl/psi/OgnlNewExpression.java
diff --git a/src/main/gen/psi/OgnlParameterList.java
b/src/main/gen/com/intellij/lang/ognl/psi/OgnlParameterList.java
similarity index 100%
rename from src/main/gen/psi/OgnlParameterList.java
rename to src/main/gen/com/intellij/lang/ognl/psi/OgnlParameterList.java
diff --git a/src/main/gen/psi/OgnlParenthesizedExpression.java
b/src/main/gen/com/intellij/lang/ognl/psi/OgnlParenthesizedExpression.java
similarity index 100%
rename from src/main/gen/psi/OgnlParenthesizedExpression.java
rename to
src/main/gen/com/intellij/lang/ognl/psi/OgnlParenthesizedExpression.java
diff --git a/src/main/gen/psi/OgnlProjectionExpression.java
b/src/main/gen/com/intellij/lang/ognl/psi/OgnlProjectionExpression.java
similarity index 100%
rename from src/main/gen/psi/OgnlProjectionExpression.java
rename to src/main/gen/com/intellij/lang/ognl/psi/OgnlProjectionExpression.java
diff --git a/src/main/gen/psi/OgnlReferenceExpression.java
b/src/main/gen/com/intellij/lang/ognl/psi/OgnlReferenceExpression.java
similarity index 100%
rename from src/main/gen/psi/OgnlReferenceExpression.java
rename to src/main/gen/com/intellij/lang/ognl/psi/OgnlReferenceExpression.java
diff --git a/src/main/gen/psi/OgnlSelectionExpression.java
b/src/main/gen/com/intellij/lang/ognl/psi/OgnlSelectionExpression.java
similarity index 100%
rename from src/main/gen/psi/OgnlSelectionExpression.java
rename to src/main/gen/com/intellij/lang/ognl/psi/OgnlSelectionExpression.java
diff --git a/src/main/gen/psi/OgnlSequenceExpression.java
b/src/main/gen/com/intellij/lang/ognl/psi/OgnlSequenceExpression.java
similarity index 100%
rename from src/main/gen/psi/OgnlSequenceExpression.java
rename to src/main/gen/com/intellij/lang/ognl/psi/OgnlSequenceExpression.java
diff --git a/src/main/gen/psi/OgnlUnaryExpression.java
b/src/main/gen/com/intellij/lang/ognl/psi/OgnlUnaryExpression.java
similarity index 100%
rename from src/main/gen/psi/OgnlUnaryExpression.java
rename to src/main/gen/com/intellij/lang/ognl/psi/OgnlUnaryExpression.java
diff --git a/src/main/gen/psi/OgnlVariableAssignmentExpression.java
b/src/main/gen/com/intellij/lang/ognl/psi/OgnlVariableAssignmentExpression.java
similarity index 100%
rename from src/main/gen/psi/OgnlVariableAssignmentExpression.java
rename to
src/main/gen/com/intellij/lang/ognl/psi/OgnlVariableAssignmentExpression.java
diff --git a/src/main/gen/psi/OgnlVariableExpression.java
b/src/main/gen/com/intellij/lang/ognl/psi/OgnlVariableExpression.java
similarity index 100%
rename from src/main/gen/psi/OgnlVariableExpression.java
rename to src/main/gen/com/intellij/lang/ognl/psi/OgnlVariableExpression.java
diff --git a/src/main/gen/psi/OgnlVisitor.java
b/src/main/gen/com/intellij/lang/ognl/psi/OgnlVisitor.java
similarity index 100%
rename from src/main/gen/psi/OgnlVisitor.java
rename to src/main/gen/com/intellij/lang/ognl/psi/OgnlVisitor.java
diff --git a/src/main/gen/psi/impl/OgnlBinaryExpressionImpl.java
b/src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlBinaryExpressionImpl.java
similarity index 100%
rename from src/main/gen/psi/impl/OgnlBinaryExpressionImpl.java
rename to
src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlBinaryExpressionImpl.java
diff --git a/src/main/gen/psi/impl/OgnlConditionalExpressionImpl.java
b/src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlConditionalExpressionImpl.java
similarity index 100%
rename from src/main/gen/psi/impl/OgnlConditionalExpressionImpl.java
rename to
src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlConditionalExpressionImpl.java
diff --git a/src/main/gen/psi/impl/OgnlExpressionImpl.java
b/src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlExpressionImpl.java
similarity index 100%
rename from src/main/gen/psi/impl/OgnlExpressionImpl.java
rename to src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlExpressionImpl.java
diff --git a/src/main/gen/psi/impl/OgnlFqnTypeExpressionImpl.java
b/src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlFqnTypeExpressionImpl.java
similarity index 100%
rename from src/main/gen/psi/impl/OgnlFqnTypeExpressionImpl.java
rename to
src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlFqnTypeExpressionImpl.java
diff --git a/src/main/gen/psi/impl/OgnlIndexedExpressionImpl.java
b/src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlIndexedExpressionImpl.java
similarity index 100%
rename from src/main/gen/psi/impl/OgnlIndexedExpressionImpl.java
rename to
src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlIndexedExpressionImpl.java
diff --git a/src/main/gen/psi/impl/OgnlLambdaExpressionImpl.java
b/src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlLambdaExpressionImpl.java
similarity index 100%
rename from src/main/gen/psi/impl/OgnlLambdaExpressionImpl.java
rename to
src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlLambdaExpressionImpl.java
diff --git a/src/main/gen/psi/impl/OgnlLiteralExpressionImpl.java
b/src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlLiteralExpressionImpl.java
similarity index 100%
rename from src/main/gen/psi/impl/OgnlLiteralExpressionImpl.java
rename to
src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlLiteralExpressionImpl.java
diff --git a/src/main/gen/psi/impl/OgnlMapEntryElementImpl.java
b/src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlMapEntryElementImpl.java
similarity index 100%
rename from src/main/gen/psi/impl/OgnlMapEntryElementImpl.java
rename to
src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlMapEntryElementImpl.java
diff --git a/src/main/gen/psi/impl/OgnlMapExpressionImpl.java
b/src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlMapExpressionImpl.java
similarity index 100%
rename from src/main/gen/psi/impl/OgnlMapExpressionImpl.java
rename to
src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlMapExpressionImpl.java
diff --git a/src/main/gen/psi/impl/OgnlMethodCallExpressionImpl.java
b/src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlMethodCallExpressionImpl.java
similarity index 100%
rename from src/main/gen/psi/impl/OgnlMethodCallExpressionImpl.java
rename to
src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlMethodCallExpressionImpl.java
diff --git a/src/main/gen/psi/impl/OgnlNewArrayExpressionImpl.java
b/src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlNewArrayExpressionImpl.java
similarity index 100%
rename from src/main/gen/psi/impl/OgnlNewArrayExpressionImpl.java
rename to
src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlNewArrayExpressionImpl.java
diff --git a/src/main/gen/psi/impl/OgnlNewExpressionImpl.java
b/src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlNewExpressionImpl.java
similarity index 100%
rename from src/main/gen/psi/impl/OgnlNewExpressionImpl.java
rename to
src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlNewExpressionImpl.java
diff --git a/src/main/gen/psi/impl/OgnlParameterListImpl.java
b/src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlParameterListImpl.java
similarity index 100%
rename from src/main/gen/psi/impl/OgnlParameterListImpl.java
rename to
src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlParameterListImpl.java
diff --git a/src/main/gen/psi/impl/OgnlParenthesizedExpressionImpl.java
b/src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlParenthesizedExpressionImpl.java
similarity index 100%
rename from src/main/gen/psi/impl/OgnlParenthesizedExpressionImpl.java
rename to
src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlParenthesizedExpressionImpl.java
diff --git a/src/main/gen/psi/impl/OgnlProjectionExpressionImpl.java
b/src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlProjectionExpressionImpl.java
similarity index 100%
rename from src/main/gen/psi/impl/OgnlProjectionExpressionImpl.java
rename to
src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlProjectionExpressionImpl.java
diff --git a/src/main/gen/psi/impl/OgnlReferenceExpressionImpl.java
b/src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlReferenceExpressionImpl.java
similarity index 100%
rename from src/main/gen/psi/impl/OgnlReferenceExpressionImpl.java
rename to
src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlReferenceExpressionImpl.java
diff --git a/src/main/gen/psi/impl/OgnlSelectionExpressionImpl.java
b/src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlSelectionExpressionImpl.java
similarity index 100%
rename from src/main/gen/psi/impl/OgnlSelectionExpressionImpl.java
rename to
src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlSelectionExpressionImpl.java
diff --git a/src/main/gen/psi/impl/OgnlSequenceExpressionImpl.java
b/src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlSequenceExpressionImpl.java
similarity index 100%
rename from src/main/gen/psi/impl/OgnlSequenceExpressionImpl.java
rename to
src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlSequenceExpressionImpl.java
diff --git a/src/main/gen/psi/impl/OgnlUnaryExpressionImpl.java
b/src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlUnaryExpressionImpl.java
similarity index 100%
rename from src/main/gen/psi/impl/OgnlUnaryExpressionImpl.java
rename to
src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlUnaryExpressionImpl.java
diff --git a/src/main/gen/psi/impl/OgnlVariableAssignmentExpressionImpl.java
b/src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlVariableAssignmentExpressionImpl.java
similarity index 100%
rename from src/main/gen/psi/impl/OgnlVariableAssignmentExpressionImpl.java
rename to
src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlVariableAssignmentExpressionImpl.java
diff --git a/src/main/gen/psi/impl/OgnlVariableExpressionImpl.java
b/src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlVariableExpressionImpl.java
similarity index 100%
rename from src/main/gen/psi/impl/OgnlVariableExpressionImpl.java
rename to
src/main/gen/com/intellij/lang/ognl/psi/impl/OgnlVariableExpressionImpl.java
diff --git a/src/main/java/com/intellij/struts2/ognl/OgnlFile.java
b/src/main/java/com/intellij/lang/ognl/OgnlFile.java
similarity index 100%
rename from src/main/java/com/intellij/struts2/ognl/OgnlFile.java
rename to src/main/java/com/intellij/lang/ognl/OgnlFile.java
diff --git a/src/main/java/com/intellij/struts2/ognl/OgnlFileType.java
b/src/main/java/com/intellij/lang/ognl/OgnlFileType.java
similarity index 100%
rename from src/main/java/com/intellij/struts2/ognl/OgnlFileType.java
rename to src/main/java/com/intellij/lang/ognl/OgnlFileType.java
diff --git a/src/main/java/com/intellij/struts2/ognl/OgnlLanguage.java
b/src/main/java/com/intellij/lang/ognl/OgnlLanguage.java
similarity index 100%
rename from src/main/java/com/intellij/struts2/ognl/OgnlLanguage.java
rename to src/main/java/com/intellij/lang/ognl/OgnlLanguage.java
diff --git a/src/main/java/com/intellij/struts2/ognl/OgnlLanguageInjector.java
b/src/main/java/com/intellij/lang/ognl/OgnlLanguageInjector.java
similarity index 100%
rename from src/main/java/com/intellij/struts2/ognl/OgnlLanguageInjector.java
rename to src/main/java/com/intellij/lang/ognl/OgnlLanguageInjector.java
diff --git a/src/main/java/com/intellij/struts2/ognl/OgnlParserDefinition.java
b/src/main/java/com/intellij/lang/ognl/OgnlParserDefinition.java
similarity index 100%
rename from src/main/java/com/intellij/struts2/ognl/OgnlParserDefinition.java
rename to src/main/java/com/intellij/lang/ognl/OgnlParserDefinition.java
diff --git
a/src/main/java/com/intellij/struts2/ognl/completion/OgnlKeywordCompletionContributor.java
b/src/main/java/com/intellij/lang/ognl/completion/OgnlKeywordCompletionContributor.java
similarity index 100%
rename from
src/main/java/com/intellij/struts2/ognl/completion/OgnlKeywordCompletionContributor.java
rename to
src/main/java/com/intellij/lang/ognl/completion/OgnlKeywordCompletionContributor.java
diff --git a/src/main/java/com/intellij/struts2/ognl/formatting/OgnlBlock.java
b/src/main/java/com/intellij/lang/ognl/formatting/OgnlBlock.java
similarity index 100%
rename from src/main/java/com/intellij/struts2/ognl/formatting/OgnlBlock.java
rename to src/main/java/com/intellij/lang/ognl/formatting/OgnlBlock.java
diff --git
a/src/main/java/com/intellij/struts2/ognl/formatting/OgnlFormattingModelBuilder.java
b/src/main/java/com/intellij/lang/ognl/formatting/OgnlFormattingModelBuilder.java
similarity index 100%
rename from
src/main/java/com/intellij/struts2/ognl/formatting/OgnlFormattingModelBuilder.java
rename to
src/main/java/com/intellij/lang/ognl/formatting/OgnlFormattingModelBuilder.java
diff --git
a/src/main/java/com/intellij/struts2/ognl/highlight/OgnlBraceMatcher.java
b/src/main/java/com/intellij/lang/ognl/highlight/OgnlBraceMatcher.java
similarity index 100%
rename from
src/main/java/com/intellij/struts2/ognl/highlight/OgnlBraceMatcher.java
rename to src/main/java/com/intellij/lang/ognl/highlight/OgnlBraceMatcher.java
diff --git
a/src/main/java/com/intellij/struts2/ognl/highlight/OgnlColorSettingsPage.java
b/src/main/java/com/intellij/lang/ognl/highlight/OgnlColorSettingsPage.java
similarity index 100%
rename from
src/main/java/com/intellij/struts2/ognl/highlight/OgnlColorSettingsPage.java
rename to
src/main/java/com/intellij/lang/ognl/highlight/OgnlColorSettingsPage.java
diff --git
a/src/main/java/com/intellij/struts2/ognl/highlight/OgnlHighlighter.java
b/src/main/java/com/intellij/lang/ognl/highlight/OgnlHighlighter.java
similarity index 100%
rename from
src/main/java/com/intellij/struts2/ognl/highlight/OgnlHighlighter.java
rename to src/main/java/com/intellij/lang/ognl/highlight/OgnlHighlighter.java
diff --git
a/src/main/java/com/intellij/struts2/ognl/highlight/OgnlHighlightingAnnotator.java
b/src/main/java/com/intellij/lang/ognl/highlight/OgnlHighlightingAnnotator.java
similarity index 100%
rename from
src/main/java/com/intellij/struts2/ognl/highlight/OgnlHighlightingAnnotator.java
rename to
src/main/java/com/intellij/lang/ognl/highlight/OgnlHighlightingAnnotator.java
diff --git
a/src/main/java/com/intellij/struts2/ognl/highlight/OgnlHighlightingLexer.java
b/src/main/java/com/intellij/lang/ognl/highlight/OgnlHighlightingLexer.java
similarity index 100%
rename from
src/main/java/com/intellij/struts2/ognl/highlight/OgnlHighlightingLexer.java
rename to
src/main/java/com/intellij/lang/ognl/highlight/OgnlHighlightingLexer.java
diff --git
a/src/main/java/com/intellij/struts2/ognl/highlight/OgnlQuoteHandler.java
b/src/main/java/com/intellij/lang/ognl/highlight/OgnlQuoteHandler.java
similarity index 100%
rename from
src/main/java/com/intellij/struts2/ognl/highlight/OgnlQuoteHandler.java
rename to src/main/java/com/intellij/lang/ognl/highlight/OgnlQuoteHandler.java
diff --git a/src/main/java/com/intellij/struts2/ognl/lexer/OgnlLexer.java
b/src/main/java/com/intellij/lang/ognl/lexer/OgnlLexer.java
similarity index 100%
rename from src/main/java/com/intellij/struts2/ognl/lexer/OgnlLexer.java
rename to src/main/java/com/intellij/lang/ognl/lexer/OgnlLexer.java
diff --git a/src/main/java/com/intellij/struts2/ognl/package-info.java
b/src/main/java/com/intellij/lang/ognl/package-info.java
similarity index 100%
rename from src/main/java/com/intellij/struts2/ognl/package-info.java
rename to src/main/java/com/intellij/lang/ognl/package-info.java
diff --git a/src/main/java/com/intellij/struts2/ognl/psi/OgnlKeyword.java
b/src/main/java/com/intellij/lang/ognl/psi/OgnlKeyword.java
similarity index 100%
rename from src/main/java/com/intellij/struts2/ognl/psi/OgnlKeyword.java
rename to src/main/java/com/intellij/lang/ognl/psi/OgnlKeyword.java
diff --git
a/src/main/java/com/intellij/struts2/ognl/psi/OgnlPsiCompositeElement.java
b/src/main/java/com/intellij/lang/ognl/psi/OgnlPsiCompositeElement.java
similarity index 100%
rename from
src/main/java/com/intellij/struts2/ognl/psi/OgnlPsiCompositeElement.java
rename to src/main/java/com/intellij/lang/ognl/psi/OgnlPsiCompositeElement.java
diff --git a/src/main/java/com/intellij/struts2/ognl/psi/OgnlTokenGroups.java
b/src/main/java/com/intellij/lang/ognl/psi/OgnlTokenGroups.java
similarity index 100%
rename from src/main/java/com/intellij/struts2/ognl/psi/OgnlTokenGroups.java
rename to src/main/java/com/intellij/lang/ognl/psi/OgnlTokenGroups.java
diff --git a/src/main/java/com/intellij/struts2/ognl/psi/OgnlTokenType.java
b/src/main/java/com/intellij/lang/ognl/psi/OgnlTokenType.java
similarity index 100%
rename from src/main/java/com/intellij/struts2/ognl/psi/OgnlTokenType.java
rename to src/main/java/com/intellij/lang/ognl/psi/OgnlTokenType.java
diff --git
a/src/main/java/com/intellij/struts2/ognl/psi/impl/OgnlFqnTypeExpressionBase.java
b/src/main/java/com/intellij/lang/ognl/psi/impl/OgnlFqnTypeExpressionBase.java
similarity index 100%
rename from
src/main/java/com/intellij/struts2/ognl/psi/impl/OgnlFqnTypeExpressionBase.java
rename to
src/main/java/com/intellij/lang/ognl/psi/impl/OgnlFqnTypeExpressionBase.java
diff --git
a/src/main/java/com/intellij/struts2/ognl/psi/impl/OgnlPsiCompositeElementBase.java
b/src/main/java/com/intellij/lang/ognl/psi/impl/OgnlPsiCompositeElementBase.java
similarity index 100%
rename from
src/main/java/com/intellij/struts2/ognl/psi/impl/OgnlPsiCompositeElementBase.java
rename to
src/main/java/com/intellij/lang/ognl/psi/impl/OgnlPsiCompositeElementBase.java
diff --git a/src/main/java/com/intellij/struts2/ognl/psi/impl/OgnlPsiUtil.java
b/src/main/java/com/intellij/lang/ognl/psi/impl/OgnlPsiUtil.java
similarity index 100%
rename from src/main/java/com/intellij/struts2/ognl/psi/impl/OgnlPsiUtil.java
rename to src/main/java/com/intellij/lang/ognl/psi/impl/OgnlPsiUtil.java
diff --git
a/src/main/java/com/intellij/struts2/ognl/psi/impl/OgnlReferenceExpressionBase.java
b/src/main/java/com/intellij/lang/ognl/psi/impl/OgnlReferenceExpressionBase.java
similarity index 100%
rename from
src/main/java/com/intellij/struts2/ognl/psi/impl/OgnlReferenceExpressionBase.java
rename to
src/main/java/com/intellij/lang/ognl/psi/impl/OgnlReferenceExpressionBase.java
diff --git
a/src/main/java/com/intellij/struts2/ognl/psi/impl/OgnlVariableExpressionBase.java
b/src/main/java/com/intellij/lang/ognl/psi/impl/OgnlVariableExpressionBase.java
similarity index 100%
rename from
src/main/java/com/intellij/struts2/ognl/psi/impl/OgnlVariableExpressionBase.java
rename to
src/main/java/com/intellij/lang/ognl/psi/impl/OgnlVariableExpressionBase.java
diff --git
a/src/main/java/com/intellij/struts2/ognl/psi/manipulators/OgnlFqnTypeExpressionManipulator.java
b/src/main/java/com/intellij/lang/ognl/psi/manipulators/OgnlFqnTypeExpressionManipulator.java
similarity index 100%
rename from
src/main/java/com/intellij/struts2/ognl/psi/manipulators/OgnlFqnTypeExpressionManipulator.java
rename to
src/main/java/com/intellij/lang/ognl/psi/manipulators/OgnlFqnTypeExpressionManipulator.java
diff --git
a/src/main/java/com/intellij/struts2/ognl/psi/resolve/OgnlResolveUtil.java
b/src/main/java/com/intellij/lang/ognl/psi/resolve/OgnlResolveUtil.java
similarity index 100%
rename from
src/main/java/com/intellij/struts2/ognl/psi/resolve/OgnlResolveUtil.java
rename to src/main/java/com/intellij/lang/ognl/psi/resolve/OgnlResolveUtil.java
diff --git
a/src/main/java/com/intellij/struts2/ognl/psi/resolve/variable/OgnlDefaultVariableReferencesContributor.java
b/src/main/java/com/intellij/lang/ognl/psi/resolve/variable/OgnlDefaultVariableReferencesContributor.java
similarity index 100%
rename from
src/main/java/com/intellij/struts2/ognl/psi/resolve/variable/OgnlDefaultVariableReferencesContributor.java
rename to
src/main/java/com/intellij/lang/ognl/psi/resolve/variable/OgnlDefaultVariableReferencesContributor.java
diff --git
a/src/main/java/com/intellij/struts2/ognl/psi/resolve/variable/OgnlVariableReference.java
b/src/main/java/com/intellij/lang/ognl/psi/resolve/variable/OgnlVariableReference.java
similarity index 100%
rename from
src/main/java/com/intellij/struts2/ognl/psi/resolve/variable/OgnlVariableReference.java
rename to
src/main/java/com/intellij/lang/ognl/psi/resolve/variable/OgnlVariableReference.java
diff --git
a/src/main/java/com/intellij/struts2/ognl/psi/resolve/variable/OgnlVariableReferencesContributor.java
b/src/main/java/com/intellij/lang/ognl/psi/resolve/variable/OgnlVariableReferencesContributor.java
similarity index 100%
rename from
src/main/java/com/intellij/struts2/ognl/psi/resolve/variable/OgnlVariableReferencesContributor.java
rename to
src/main/java/com/intellij/lang/ognl/psi/resolve/variable/OgnlVariableReferencesContributor.java
diff --git
a/src/main/java/com/intellij/struts2/ognl/spellchecker/OgnlSpellcheckingStrategy.java
b/src/main/java/com/intellij/lang/ognl/spellchecker/OgnlSpellcheckingStrategy.java
similarity index 100%
rename from
src/main/java/com/intellij/struts2/ognl/spellchecker/OgnlSpellcheckingStrategy.java
rename to
src/main/java/com/intellij/lang/ognl/spellchecker/OgnlSpellcheckingStrategy.java
